fs: use mapping_set_error instead of opencoded set_bit

The mapping_set_error() helper sets the correct AS_ flag for the mapping
so there is no reason to open code it.  Use the helper directly.

[akpm@linux-foundation.org: be honest about conversion from -ENXIO to -EIO]
Link: http://lkml.kernel.org/r/20160912111608.2588-2-mhocko@kernel.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

7 files changed, 9 insertions, 14 deletions

diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c
index 5d79efc1aafe..046e84d7a158 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c
@@ -241,10 +241,7 @@ static void vvp_vmpage_error(struct inode *inode, struct page *vmpage, int ioret
                 obj->vob_discard_page_warned = 0;
         } else {
                 SetPageError(vmpage);
-                if (ioret == -ENOSPC)
-                        set_bit(AS_ENOSPC, &inode->i_mapping->flags);
-                else
-                        set_bit(AS_EIO, &inode->i_mapping->flags);
+                mapping_set_error(inode->i_mapping, ioret);
 
                 if ((ioret == -ESHUTDOWN || ioret == -EINTR) &&
                     obj->vob_discard_page_warned == 0) {
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 14d506efd1aa..f865c3f05bea 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -398,8 +398,7 @@ no_more:
                 switch (ret) {
                 case -EDQUOT:
                 case -ENOSPC:
-                        set_bit(AS_ENOSPC,
-                                &wb->vnode->vfs_inode.i_mapping->flags);
+                        mapping_set_error(wb->vnode->vfs_inode.i_mapping, -ENOSPC);
                         break;
                 case -EROFS:
                 case -EIO:
@@ -409,7 +408,7 @@ no_more:
                 case -ENOMEDIUM:
                 case -ENXIO:
                         afs_kill_pages(wb->vnode, true, first, last);
-                        set_bit(AS_EIO, &wb->vnode->vfs_inode.i_mapping->flags);
+                        mapping_set_error(wb->vnode->vfs_inode.i_mapping, -EIO);
                         break;
                 case -EACCES:
                 case -EPERM:
diff --git a/fs/buffer.c b/fs/buffer.c
index 7dad8713fac8..b205a629001d 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -351,7 +351,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
                 set_buffer_uptodate(bh);
         } else {
                 buffer_io_error(bh, ", lost async page write");
-                set_bit(AS_EIO, &page->mapping->flags);
+                mapping_set_error(page->mapping, -EIO);
                 set_buffer_write_io_error(bh);
                 clear_buffer_uptodate(bh);
                 SetPageError(page);
@@ -3249,7 +3249,7 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free)
         bh = head;
         do {
                 if (buffer_write_io_error(bh) && page->mapping)
-                        set_bit(AS_EIO, &page->mapping->flags);
+                        mapping_set_error(page->mapping, -EIO);
                 if (buffer_busy(bh))
                         goto failed;
                 bh = bh->b_this_page;
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index d42ff527ab21..d8072bc074a4 100644
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -778,7 +778,7 @@ try_again:
 fail:
         EXOFS_DBGMSG("Error: writepage_strip(0x%lx, 0x%lx)=>%d\n",
                      inode->i_ino, page->index, ret);
-        set_bit(AS_EIO, &page->mapping->flags);
+        mapping_set_error(page->mapping, -EIO);
         unlock_page(page);
         return ret;
 }
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index b4cbee936cf8..0094923e5ebf 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -88,7 +88,7 @@ static void ext4_finish_bio(struct bio *bio)
 
                 if (bio->bi_error) {
                         SetPageError(page);
-                        set_bit(AS_EIO, &page->mapping->flags);
+                        mapping_set_error(page->mapping, -EIO);
                 }
                 bh = head = page_buffers(page);
                 /*
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 0d0177c9149c..9ae194fd2fdb 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -75,7 +75,7 @@ static void f2fs_write_end_io(struct bio *bio)
                 fscrypt_pullback_bio_page(&page, true);
 
                 if (unlikely(bio->bi_error)) {
-                        set_bit(AS_EIO, &page->mapping->flags);
+                        mapping_set_error(page->mapping, -EIO);
                         f2fs_stop_checkpoint(sbi, true);
                 }
                 end_page_writeback(page);
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 5bb565f9989c..31f8ca046639 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -269,8 +269,7 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
                          * filemap_fdatawait_range(), set it again so
                          * that user process can get -EIO from fsync().
                          */
-                        set_bit(AS_EIO,
-                                &jinode->i_vfs_inode->i_mapping->flags);
+                        mapping_set_error(jinode->i_vfs_inode->i_mapping, -EIO);
 
                         if (!ret)
                                 ret = err;