[Devel] [PATCH RHEL7 COMMIT] ms/buffer: use mapping_set_error instead of setting the flag

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-862.vz7.48.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.el7
------>
commit d6b1df869bdc01c82d930cc38195ff920be0a6e2
Author: Vasily Averin <vvs at virtuozzo.com>
Date:   Sat Jun 9 13:29:30 2018 +0300

    ms/buffer: use mapping_set_error instead of setting the flag
    
    mainline commit d945b59 ("buffer: use mapping_set_error instead of setting the flag")
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Reviewed-by: Jan Kara <jack at suse.cz>
    Reviewed-by: Matthew Wilcox <mawilcox at microsoft.com>
    Reviewed-by: Christoph Hellwig <hch at lst.de>
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 fs/buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/buffer.c b/fs/buffer.c
index 43fcaa3492af..75ee762f1dcf 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -483,7 +483,7 @@ static void __remove_assoc_queue(struct buffer_head *bh)
 	list_del_init(&bh->b_assoc_buffers);
 	WARN_ON(!bh->b_assoc_map);
 	if (buffer_write_io_error(bh))
-		set_bit(AS_EIO, &bh->b_assoc_map->flags);
+		mapping_set_error(bh->b_assoc_map, -EIO);
 	bh->b_assoc_map = NULL;
 }