iomap: assign current->backing_dev_info in iomap_file_buffered_write

Move the assignment to current->backing_dev_info from the callers into
iomap_file_buffered_write.  Note that zonefs was missing this assignment
before.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 300844f50dcd28246eb17c2e81d1fa3119a46b81..25a6186aa6d6dbef7c6379fa2fcd9dca57ee8f26 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -25,7 +25,6 @@
 #include <linux/dlm.h>
 #include <linux/dlm_plock.h>
 #include <linux/delay.h>
-#include <linux/backing-dev.h>
 #include <linux/fileattr.h>
 
 #include "gfs2.h"
@@ -1041,11 +1040,9 @@ retry:
                        goto out_unlock;
        }
 
-       current->backing_dev_info = inode_to_bdi(inode);
        pagefault_disable();
        ret = iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops);
        pagefault_enable();
-       current->backing_dev_info = NULL;
        if (ret > 0) {
                iocb->ki_pos += ret;
                written += ret;

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 6f4c97a6d7e9dcdaa5aa9a06159d33d91c0aa9f6..2d2b0a7048e45db1d39c644403760a80a2dc9b6f 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2010 Red Hat, Inc.
  * Copyright (C) 2016-2019 Christoph Hellwig.
  */
+#include <linux/backing-dev.h>
 #include <linux/module.h>
 #include <linux/compiler.h>
 #include <linux/fs.h>
@@ -876,8 +877,11 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,
        if (iocb->ki_flags & IOCB_NOWAIT)
                iter.flags |= IOMAP_NOWAIT;
 
+       current->backing_dev_info = inode_to_bdi(iter.inode);
        while ((ret = iomap_iter(&iter, ops)) > 0)
                iter.processed = iomap_write_iter(&iter, i);
+       current->backing_dev_info = NULL;
+
        if (iter.pos == iocb->ki_pos)
                return ret;
        return iter.pos - iocb->ki_pos;

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 705250f9f90a1b3d9fad16cf84df582145a21422..f5442e689baf150abd8d488f57409c3e4afea16a 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -27,7 +27,6 @@
 
 #include <linux/dax.h>
 #include <linux/falloc.h>
-#include <linux/backing-dev.h>
 #include <linux/mman.h>
 #include <linux/fadvise.h>
 #include <linux/mount.h>
@@ -717,9 +716,6 @@ write_retry:
        if (ret)
                goto out;
 
-       /* We can write back this queue in page reclaim */
-       current->backing_dev_info = inode_to_bdi(inode);
-
        trace_xfs_file_buffered_write(iocb, from);
        ret = iomap_file_buffered_write(iocb, from,
                        &xfs_buffered_write_iomap_ops);
@@ -753,7 +749,6 @@ write_retry:
                goto write_retry;
        }
 
-       current->backing_dev_info = NULL;
 out:
        if (iolock)
                xfs_iunlock(ip, iolock);