From: Erez Zadok <ezk@xxxxxxxxxxxxx>
Signed-off-by: Erez Zadok <ezk@xxxxxxxxxxxxx>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@xxxxxxxxxxxxx>
---
fs/unionfs/fanout.h | 8 ++++----
fs/unionfs/union.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/unionfs/fanout.h b/fs/unionfs/fanout.h
index e2acb75..3d1dd4c 100644
--- 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 5676394..df9b8c0 100644
--- 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;
};
--
1.5.0.3.268.g3dda
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
