Unionfs: Rename unionfs_data sbcount field to more appropriate open_files

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>

diff --git a/fs/unionfs/fanout.h b/fs/unionfs/fanout.h
index e2acb75df697a50918e531eeb20891e591867ed0..3d1dd4c647a16aa4ec14d0322bf07cd9861de6b1 100644 (file)
--- a/fs/unionfs/fanout.h
+++ b/fs/unionfs/fanout.h
@@ -106,22 +106,22 @@ static inline void unionfs_set_lower_super(struct super_block *sb, struct super_
 /* Branch count macros. */
 static inline int branch_count(const struct super_block *sb, int index)
 {
-       return atomic_read(&UNIONFS_SB(sb)->data[index].sbcount);
+       return atomic_read(&UNIONFS_SB(sb)->data[index].open_files);
 }
 
 static inline void set_branch_count(struct super_block *sb, int index, int val)
 {
-       atomic_set(&UNIONFS_SB(sb)->data[index].sbcount, val);
+       atomic_set(&UNIONFS_SB(sb)->data[index].open_files, val);
 }
 
 static inline void branchget(struct super_block *sb, int index)
 {
-       atomic_inc(&UNIONFS_SB(sb)->data[index].sbcount);
+       atomic_inc(&UNIONFS_SB(sb)->data[index].open_files);
 }
 
 static inline void branchput(struct super_block *sb, int index)
 {
-       atomic_dec(&UNIONFS_SB(sb)->data[index].sbcount);
+       atomic_dec(&UNIONFS_SB(sb)->data[index].open_files);
 }
 
 /* Dentry macros */

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 56763949e32414b54891e593802b84688d1b15fd..df9b8c0c6453691c3209cad7c7c6d7951990fe19 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -121,7 +121,7 @@ struct unionfs_dentry_info {
 /* These are the pointers to our various objects. */
 struct unionfs_data {
        struct super_block *sb;
-       atomic_t sbcount;
+       atomic_t open_files;    /* number of open files on branch */
        int branchperms;
 };