fs: move wait_on_inode() from writeback.h to fs.h

The only consumer outside of fs/inode.c is gfs2 and it already includes
fs.h in the relevant file.

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/include/linux/fs.h b/include/linux/fs.h
index ac62b9d10b00e5c8ea002de97078f0fc7a367a4e..b35014ba681ba4672b642045f4a692a8543fd155 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -949,6 +949,16 @@ static inline void inode_fake_hash(struct inode *inode)
        hlist_add_fake(&inode->i_hash);
 }
 
+static inline void wait_on_inode(struct inode *inode)
+{
+       wait_var_event(inode_state_wait_address(inode, __I_NEW),
+                      !(READ_ONCE(inode->i_state) & I_NEW));
+       /*
+        * Pairs with routines clearing I_NEW.
+        */
+       smp_rmb();
+}
+
 /*
  * inode->i_rwsem nesting subclasses for the lock validator:
  *

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index e1e1231a68303a019456f1f8293263caa518b9a9..06195c2a535bae6cef23fa83053bb5265b004fc5 100644 (file)
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -189,17 +189,6 @@ void wakeup_flusher_threads_bdi(struct backing_dev_info *bdi,
 void inode_wait_for_writeback(struct inode *inode);
 void inode_io_list_del(struct inode *inode);
 
-/* writeback.h requires fs.h; it, too, is not included from here. */
-static inline void wait_on_inode(struct inode *inode)
-{
-       wait_var_event(inode_state_wait_address(inode, __I_NEW),
-                      !(READ_ONCE(inode->i_state) & I_NEW));
-       /*
-        * Pairs with routines clearing I_NEW.
-        */
-       smp_rmb();
-}
-
 #ifdef CONFIG_CGROUP_WRITEBACK
 
 #include <linux/cgroup.h>