gfs2: move setting current->backing_dev_info

BugLink: https://bugs.launchpad.net/bugs/1863588
commit 4c0e8dda608a51855225c611b5c6b442f95fbc56 upstream.

Set current->backing_dev_info just around the buffered write calls to
prepare for the next fix.

Fixes: 967bcc91b044 ("gfs2: iomap direct I/O support")
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 01ff37b76652cdaeb5cd5fc01f6a1a1ca6f5b189..c02787869d9f8b0130b08a18155779b8979fe22a 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -853,18 +853,15 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        inode_lock(inode);
        ret = generic_write_checks(iocb, from);
        if (ret <= 0)
-               goto out;
-
-       /* We can write back this queue in page reclaim */
-       current->backing_dev_info = inode_to_bdi(inode);
+               goto out_unlock;
 
        ret = file_remove_privs(file);
        if (ret)
-               goto out2;
+               goto out_unlock;
 
        ret = file_update_time(file);
        if (ret)
-               goto out2;
+               goto out_unlock;
 
        if (iocb->ki_flags & IOCB_DIRECT) {
                struct address_space *mapping = file->f_mapping;
@@ -873,11 +870,13 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 
                written = gfs2_file_direct_write(iocb, from);
                if (written < 0 || !iov_iter_count(from))
-                       goto out2;
+                       goto out_unlock;
 
+               current->backing_dev_info = inode_to_bdi(inode);
                ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
+               current->backing_dev_info = NULL;
                if (unlikely(ret < 0))
-                       goto out2;
+                       goto out_unlock;
                buffered = ret;
 
                /*
@@ -901,14 +900,14 @@ static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                         */
                }
        } else {
+               current->backing_dev_info = inode_to_bdi(inode);
                ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
+               current->backing_dev_info = NULL;
                if (likely(ret > 0))
                        iocb->ki_pos += ret;
        }
 
-out2:
-       current->backing_dev_info = NULL;
-out:
+out_unlock:
        inode_unlock(inode);
        if (likely(ret > 0)) {
                /* Handle various SYNC-type writes */