cifs: set mapping error when page writeback fails in writepage or launder_pages
diff mbox

Message ID 20170525105952.8867-1-jlayton@redhat.com
State New
Headers show

Commit Message

Jeff Layton May 25, 2017, 10:59 a.m. UTC
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
---
 fs/cifs/file.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Steve French June 23, 2017, 7:15 a.m. UTC | #1
merged into cifs-2.6.git for-next

On Thu, May 25, 2017 at 5:59 AM, Jeff Layton <jlayton@redhat.com> wrote:
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Jan Kara <jack@suse.cz>
> ---
>  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 0fd081bd2a2f..5009860dbdc6 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.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0fd081bd2a2f..5009860dbdc6 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);