Unionfs: simplify the macros used to get/set the dentry start/end branches

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 0430964896ba0854dca32f50a95759b57a4f9c30..c90c8b818a979a5bcf8366341b9fb70639263866 100644 (file)
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -291,7 +291,7 @@ static int do_delayed_copyup(struct file *file)
        }
        /* for reg file, we only open it "once" */
        fbend(file) = fbstart(file);
-       set_dbend(dentry, dbstart(dentry));
+       dbend(dentry) = dbstart(dentry);
        ibend(dentry->d_inode) = ibstart(dentry->d_inode);
 
 out:
@@ -822,8 +822,8 @@ static int unionfs_ioctl_queryfile(struct file *file, unsigned int cmd,
                }
        }
        /* restore original dentry's offsets */
-       set_dbstart(dentry, orig_bstart);
-       set_dbend(dentry, orig_bend);
+       dbstart(dentry) = orig_bstart;
+       dbend(dentry) = orig_bend;
        ibstart(dentry->d_inode) = orig_bstart;
        ibend(dentry->d_inode) = orig_bend;
 

diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index f914840c37644f868652d39a682f107196fbf7f3..53343bffe24c1b3b2d08d2f6d1837c732e18e29d 100644 (file)
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -348,8 +348,8 @@ static void __clear(struct dentry *dentry, struct dentry *old_lower_dentry,
 {
        /* get rid of the lower dentry and all its traces */
        unionfs_set_lower_dentry_idx(dentry, new_bindex, NULL);
-       set_dbstart(dentry, old_bstart);
-       set_dbend(dentry, old_bend);
+       dbstart(dentry) = old_bstart;
+       dbend(dentry) = old_bend;
 
        dput(new_lower_dentry);
        dput(old_lower_dentry);
@@ -628,8 +628,8 @@ static void __cleanup_dentry(struct dentry *dentry, int bindex,
                new_bstart = bindex;
        if (new_bend < 0)
                new_bend = bindex;
-       set_dbstart(dentry, new_bstart);
-       set_dbend(dentry, new_bend);
+       dbstart(dentry) = new_bstart;
+       dbend(dentry) = new_bend;
 
 }
 
@@ -652,9 +652,9 @@ static void __set_dentry(struct dentry *upper, struct dentry *lower,
 {
        unionfs_set_lower_dentry_idx(upper, bindex, lower);
        if (likely(dbstart(upper) > bindex))
-               set_dbstart(upper, bindex);
+               dbstart(upper) = bindex;
        if (likely(dbend(upper) < bindex))
-               set_dbend(upper, bindex);
+               dbend(upper) = bindex;
 }
 
 /*
@@ -880,6 +880,6 @@ void unionfs_postcopyup_release(struct dentry *dentry)
                }
        }
        bindex = dbstart(dentry);
-       set_dbend(dentry, bindex);
+       dbend(dentry) = bindex;
        ibend(dentry->d_inode) = ibstart(dentry->d_inode) = bindex;
 }

diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index b41c8f6e44a5ce580bf16711191f423c51107c7e..c450f14212cd5100d1f1da65de6f88c75e70f13c 100644 (file)
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -106,8 +106,7 @@ static bool __unionfs_d_revalidate_one(struct dentry *dentry,
                bstart = dbstart(dentry);
                bend = dbend(dentry);
                __dput_lowers(dentry, bstart, bend);
-               set_dbstart(dentry, -1);
-               set_dbend(dentry, -1);
+               dbstart(dentry) = dbend(dentry) = -1;
 
                interpose_flag = INTERPOSE_REVAL_NEG;
                if (positive) {
@@ -534,8 +533,7 @@ static void unionfs_d_iput(struct dentry *dentry, struct inode *inode)
                        unionfs_set_lower_dentry_idx(dentry, bindex, NULL);
                }
        }
-       set_dbstart(dentry, -1);
-       set_dbend(dentry, -1);
+       dbstart(dentry) = dbend(dentry) = -1;
 
 drop_lower_inodes:
        rc = atomic_read(&inode->i_count);

diff --git a/fs/unionfs/fanout.h b/fs/unionfs/fanout.h
index d426ef4d3d9afdd84d12d4698391f2517ca0a110..3667d2459444dcfa95dca5c402227f86f9f51807 100644 (file)
--- a/fs/unionfs/fanout.h
+++ b/fs/unionfs/fanout.h
@@ -34,6 +34,12 @@ static inline struct unionfs_inode_info *UNIONFS_I(const struct inode *inode)
 #define ibstart(ino) (UNIONFS_I(ino)->bstart)
 #define ibend(ino) (UNIONFS_I(ino)->bend)
 
+/* Dentry to private data */
+#define UNIONFS_D(dent) ((struct unionfs_dentry_info *)(dent)->d_fsdata)
+#define dbstart(dent) (UNIONFS_D(dent)->bstart)
+#define dbend(dent) (UNIONFS_D(dent)->bend)
+#define dbopaque(dent) (UNIONFS_D(dent)->bopaque)
+
 /* Superblock to private data */
 #define UNIONFS_SB(super) ((struct unionfs_sb_info *)(super)->s_fs_info)
 #define sbstart(sb) 0
@@ -200,48 +206,6 @@ static inline void branchput(struct super_block *sb, int index)
 }
 
 /* Dentry macros */
-static inline struct unionfs_dentry_info *UNIONFS_D(const struct dentry *dent)
-{
-       BUG_ON(!dent);
-       return dent->d_fsdata;
-}
-
-static inline int dbstart(const struct dentry *dent)
-{
-       BUG_ON(!dent);
-       return UNIONFS_D(dent)->bstart;
-}
-
-static inline void set_dbstart(struct dentry *dent, int val)
-{
-       BUG_ON(!dent);
-       UNIONFS_D(dent)->bstart = val;
-}
-
-static inline int dbend(const struct dentry *dent)
-{
-       BUG_ON(!dent);
-       return UNIONFS_D(dent)->bend;
-}
-
-static inline void set_dbend(struct dentry *dent, int val)
-{
-       BUG_ON(!dent);
-       UNIONFS_D(dent)->bend = val;
-}
-
-static inline int dbopaque(const struct dentry *dent)
-{
-       BUG_ON(!dent);
-       return UNIONFS_D(dent)->bopaque;
-}
-
-static inline void set_dbopaque(struct dentry *dent, int val)
-{
-       BUG_ON(!dent);
-       UNIONFS_D(dent)->bopaque = val;
-}
-
 static inline void unionfs_set_lower_dentry_idx(struct dentry *dent, int index,
                                                struct dentry *val)
 {

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index e27cdd56898fcb0b652c5cfcf6cad517707dcde0..b6de7287118b848b46dd1e54f9055eb4f7266880 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -636,7 +636,7 @@ static int unionfs_mkdir(struct inode *parent, struct dentry *dentry, int mode)
                                unionfs_set_lower_dentry_idx(dentry, i, NULL);
                        }
                }
-               set_dbend(dentry, bindex);
+               dbend(dentry) = bindex;
 
                /*
                 * Only INTERPOSE_LOOKUP can return a value other than 0 on

diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 3e59e0bc97885589ff764d3f302f9953b39ddd41..f1426158fdc5873e08d3bb3e7ed20901e7ca53dc 100644 (file)
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -206,8 +206,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
                if (wh_lower_dentry->d_inode) {
                        /* We found a whiteout so let's give up. */
                        if (S_ISREG(wh_lower_dentry->d_inode->i_mode)) {
-                               set_dbend(dentry, bindex);
-                               set_dbopaque(dentry, bindex);
+                               dbend(dentry) = dbopaque(dentry) = bindex;
                                dput(wh_lower_dentry);
                                break;
                        }
@@ -282,7 +281,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
 
                /* store underlying dentry */
                if (dbstart(dentry) == -1)
-                       set_dbstart(dentry, bindex);
+                       dbstart(dentry) = bindex;
                unionfs_set_lower_dentry_idx(dentry, bindex, lower_dentry);
                /*
                 * FIXME: the following line needs to get fixed to allow
@@ -291,7 +290,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
                unionfs_set_lower_mnt_idx(dentry, bindex,
                                          unionfs_mntget(parent_dentry,
                                                         bindex));
-               set_dbend(dentry, bindex);
+               dbend(dentry) = bindex;
 
                /* update parent directory's atime with the bindex */
                fsstack_copy_attr_atime(parent_dentry->d_inode,
@@ -312,8 +311,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
                        err = opaque;
                        goto out_free;
                } else if (opaque) {
-                       set_dbend(dentry, bindex);
-                       set_dbopaque(dentry, bindex);
+                       dbend(dentry) = dbopaque(dentry) = bindex;
                        break;
                }
        }
@@ -365,8 +363,7 @@ out_negative:
                                     first_lower_dentry);
        unionfs_set_lower_mnt_idx(dentry, first_dentry_offset,
                                  first_lower_mnt);
-       set_dbstart(dentry, first_dentry_offset);
-       set_dbend(dentry, first_dentry_offset);
+       dbstart(dentry) = dbend(dentry) = first_dentry_offset;
 
        if (lookupmode == INTERPOSE_REVAL_NEG)
                BUG_ON(dentry->d_inode != NULL);
@@ -433,8 +430,7 @@ out_free:
        }
        kfree(UNIONFS_D(dentry)->lower_paths);
        UNIONFS_D(dentry)->lower_paths = NULL;
-       set_dbstart(dentry, -1);
-       set_dbend(dentry, -1);
+       dbstart(dentry) = dbend(dentry) = -1;
 
 out:
        if (!err && UNIONFS_D(dentry)) {
@@ -595,7 +591,7 @@ void update_bstart(struct dentry *dentry)
                if (!lower_dentry)
                        continue;
                if (lower_dentry->d_inode) {
-                       set_dbstart(dentry, bindex);
+                       dbstart(dentry) = bindex;
                        break;
                }
                dput(lower_dentry);

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 4059d006983ffbaedbc6603614d1bfc13a07b5fb..cdb4c805db5dfcfd64ea7fa11cfc82575098c34e 100644 (file)
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -678,8 +678,8 @@ static int unionfs_read_super(struct super_block *sb, void *raw_data,
                unionfs_set_lower_dentry_idx(sb->s_root, bindex, d);
                unionfs_set_lower_mnt_idx(sb->s_root, bindex, m);
        }
-       set_dbstart(sb->s_root, bstart);
-       set_dbend(sb->s_root, bend);
+       dbstart(sb->s_root) = bstart;
+       dbend(sb->s_root) = bend;
 
        /* Set the generation number to one, since this is for the mount. */
        atomic_set(&UNIONFS_D(sb->s_root)->generation, 1);

diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 81c5a8714fa46234d47f1b49644fee7606b9131f..10c69ae99fe6126ee63276c97fbc1e01dda6d69e 100644 (file)
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -182,9 +182,9 @@ out:
        if (!err) {
                /* Fixup the new_dentry. */
                if (bindex < dbstart(new_dentry))
-                       set_dbstart(new_dentry, bindex);
+                       dbstart(new_dentry) = bindex;
                else if (bindex > dbend(new_dentry))
-                       set_dbend(new_dentry, bindex);
+                       dbend(new_dentry) = bindex;
        }
 
        kfree(wh_name);
@@ -320,7 +320,7 @@ static int do_unionfs_rename(struct inode *old_dir,
                                       NULL);
                unlock_dir(lower_parent);
                if (!local_err) {
-                       set_dbopaque(old_dentry, bwh_old);
+                       dbopaque(old_dentry) = bwh_old;
                } else {
                        /*
                         * we can't fix anything now, so we cop-out and use
@@ -447,9 +447,9 @@ static int may_rename_dir(struct dentry *dentry)
        if (dbend(dentry) == bstart || dbopaque(dentry) == bstart)
                return 0;
 
-       set_dbstart(dentry, bstart + 1);
+       dbstart(dentry) = bstart + 1;
        err = check_empty(dentry, NULL);
-       set_dbstart(dentry, bstart);
+       dbstart(dentry) = bstart;
        if (err == -ENOTEMPTY)
                err = -EXDEV;
        return err;

diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c
index 8f040930e4f1cbac66a5888e1b446bb21a3f6d58..3e6ef8781ad8f9a484f24de44f12ba85c3523b79 100644 (file)
--- a/fs/unionfs/subr.c
+++ b/fs/unionfs/subr.c
@@ -102,7 +102,7 @@ int create_whiteout(struct dentry *dentry, int start)
 
        /* set dbopaque so that lookup will not proceed after this branch */
        if (!err)
-               set_dbopaque(dentry, bindex);
+               dbopaque(dentry) = bindex;
 
 out:
        kfree(name);
@@ -186,7 +186,7 @@ int make_dir_opaque(struct dentry *dentry, int bindex)
        if (!diropq->d_inode)
                err = vfs_create(lower_dir, diropq, S_IRUGO, NULL);
        if (!err)
-               set_dbopaque(dentry, bindex);
+               dbopaque(dentry) = bindex;
 
        dput(diropq);
 

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 9ac4c3bd108820b90c91ca89ee74ed6e8f022f1e..ed9eff57263cd3f1ada8b4befbc29d342c1f6ea6 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -760,7 +760,7 @@ out_no_change:
        /* update our unionfs_sb_info and root dentry index of last branch */
        i = sbmax(sb);          /* save no. of branches to release at end */
        sbend(sb) = new_branches - 1;
-       set_dbend(sb->s_root, new_branches - 1);
+       dbend(sb->s_root) = new_branches - 1;
        old_ibstart = ibstart(sb->s_root->d_inode);
        old_ibend = ibend(sb->s_root->d_inode);
        ibend(sb->s_root->d_inode) = new_branches - 1;