fs: move I_DIRTY_INODE to fs.h

commit 0e11f6443f522f89509495b13ef1f3745640144d upstream.

And use it in a few more places rather than opencoding the values.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 898f962d3a068394abcd40976987caf4c208a6f3..098856fcecf8c29fc63b862b0e5760bd16e456a9 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5064,12 +5064,12 @@ static int other_inode_match(struct inode * inode, unsigned long ino,
 
        if ((inode->i_ino != ino) ||
            (inode->i_state & (I_FREEING | I_WILL_FREE | I_NEW |
-                              I_DIRTY_SYNC | I_DIRTY_DATASYNC)) ||
+                              I_DIRTY_INODE)) ||
            ((inode->i_state & I_DIRTY_TIME) == 0))
                return 0;
        spin_lock(&inode->i_lock);
        if (((inode->i_state & (I_FREEING | I_WILL_FREE | I_NEW |
-                               I_DIRTY_SYNC | I_DIRTY_DATASYNC)) == 0) &&
+                               I_DIRTY_INODE)) == 0) &&
            (inode->i_state & I_DIRTY_TIME)) {
                struct ext4_inode_info  *ei = EXT4_I(inode);
 

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 3dbb875ed79031ded99a7a5aba474b5b52bbc508..5a115dc9bc9a9890ee4831bb07cbd7406979acdb 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -1400,7 +1400,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
 
        dirty = inode->i_state & I_DIRTY;
        if (inode->i_state & I_DIRTY_TIME) {
-               if ((dirty & (I_DIRTY_SYNC | I_DIRTY_DATASYNC)) ||
+               if ((dirty & I_DIRTY_INODE) ||
                    wbc->sync_mode == WB_SYNC_ALL ||
                    unlikely(inode->i_state & I_DIRTY_TIME_EXPIRED) ||
                    unlikely(time_after(jiffies,
@@ -2136,7 +2136,6 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode)
  */
 void __mark_inode_dirty(struct inode *inode, int flags)
 {
-#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)
        struct super_block *sb = inode->i_sb;
        int dirtytime;
 
@@ -2146,7 +2145,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)
         * Don't do this for I_DIRTY_PAGES - that doesn't actually
         * dirty the inode itself
         */
-       if (flags & (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_TIME)) {
+       if (flags & (I_DIRTY_INODE | I_DIRTY_TIME)) {
                trace_writeback_dirty_inode_start(inode, flags);
 
                if (sb->s_op->dirty_inode)
@@ -2222,7 +2221,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)
                        if (dirtytime)
                                inode->dirtied_time_when = jiffies;
 
-                       if (inode->i_state & (I_DIRTY_INODE | I_DIRTY_PAGES))
+                       if (inode->i_state & I_DIRTY)
                                dirty_list = &wb->b_dirty;
                        else
                                dirty_list = &wb->b_dirty_time;
@@ -2246,8 +2245,6 @@ void __mark_inode_dirty(struct inode *inode, int flags)
        }
 out_unlock_inode:
        spin_unlock(&inode->i_lock);
-
-#undef I_DIRTY_INODE
 }
 EXPORT_SYMBOL(__mark_inode_dirty);
 

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 639e2c86758a4165139824ecf754d562fb66fa02..bcf95ec1bc31db91964636c6057a8660bbcc6948 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -791,7 +791,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)
        int need_endtrans = 0;
        int ret;
 
-       if (!(flags & (I_DIRTY_DATASYNC|I_DIRTY_SYNC)))
+       if (!(flags & I_DIRTY_INODE))
                return;
        if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                return;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 30172ad84b25f91ba1e398f7badd4795b07df829..50e7455195f77df2dcec6cf23d334db3867eae9c 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2015,7 +2015,8 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)
 #define I_OVL_INUSE                    (1 << 14)
 #define I_SYNC_QUEUED          (1 << 17)
 
-#define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES)
+#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)
+#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)
 #define I_DIRTY_ALL (I_DIRTY | I_DIRTY_TIME)
 
 extern void __mark_inode_dirty(struct inode *, int);