[PATCH 4.19 113/195] gfs2: move setting current->backing_dev_info

From: Greg Kroah-Hartman
Date: Mon Feb 10 2020 - 07:36:35 EST


From: Christoph Hellwig <hch@xxxxxx>

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@xxxxxxxxxxxxxxx # v4.19+
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
fs/gfs2/file.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)

--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -800,18 +800,15 @@ static ssize_t gfs2_file_write_iter(stru
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;
@@ -820,11 +817,13 @@ static ssize_t gfs2_file_write_iter(stru

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;

/*
@@ -848,14 +847,14 @@ static ssize_t gfs2_file_write_iter(stru
*/
}
} 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 */