| Message ID | 20170509154930.29524-13-jlayton@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue 09-05-17 11:49:15, Jeff Layton wrote: > Signed-off-by: Jeff Layton <jlayton@redhat.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> Looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/cifs/file.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > index 21d404535739..0bee7f8d91ad 100644 > --- a/fs/cifs/file.c > +++ b/fs/cifs/file.c > @@ -2234,14 +2234,16 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc) > set_page_writeback(page); > retry_write: > rc = cifs_partialpagewrite(page, 0, PAGE_SIZE); > - if (rc == -EAGAIN && wbc->sync_mode == WB_SYNC_ALL) > - goto retry_write; > - else if (rc == -EAGAIN) > + if (rc == -EAGAIN) { > + if (wbc->sync_mode == WB_SYNC_ALL) > + goto retry_write; > redirty_page_for_writepage(wbc, page); > - else if (rc != 0) > + } else if (rc != 0) { > SetPageError(page); > - else > + mapping_set_error(page->mapping, rc); > + } else { > SetPageUptodate(page); > + } > end_page_writeback(page); > put_page(page); > free_xid(xid); > -- > 2.9.3 > >
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 21d404535739..0bee7f8d91ad 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2234,14 +2234,16 @@ cifs_writepage_locked(struct page *page, struct writeback_control *wbc) set_page_writeback(page); retry_write: rc = cifs_partialpagewrite(page, 0, PAGE_SIZE); - if (rc == -EAGAIN && wbc->sync_mode == WB_SYNC_ALL) - goto retry_write; - else if (rc == -EAGAIN) + if (rc == -EAGAIN) { + if (wbc->sync_mode == WB_SYNC_ALL) + goto retry_write; redirty_page_for_writepage(wbc, page); - else if (rc != 0) + } else if (rc != 0) { SetPageError(page); - else + mapping_set_error(page->mapping, rc); + } else { SetPageUptodate(page); + } end_page_writeback(page); put_page(page); free_xid(xid);