commit a5f086792d3943fd587fa85db5e9ccd27cdac5ed
Author: Josef 'Jeff' Sipek <[EMAIL PROTECTED]>
Date: Fri Nov 16 14:55:05 2007 -0500
Unionfs: Change free_dentry_private_info to take a struct dentry
This makes it more symmetric with new_dentry_private_info.
Signed-off-by: Josef 'Jeff' Sipek <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index d38f1ae..4c51fe5 100644
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -472,8 +472,7 @@ static void unionfs_d_release(struct dentry *dentry)
out_free:
/* No need to unlock it, because it is disappeared. */
- free_dentry_private_data(UNIONFS_D(dentry));
- dentry->d_fsdata = NULL; /* just to be safe */
+ free_dentry_private_data(dentry);
out:
return;
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 61c6119..b4c489c 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -18,6 +18,8 @@
#include "union.h"
+static int realloc_dentry_private_data(struct dentry *dentry);
+
/* The rest of these are utility functions for lookup. */
/*
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index e8eb67c..85eda26 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -763,7 +763,7 @@ static int unionfs_read_super(struct super_block *sb, void
*raw_data,
out_freedpd:
if (UNIONFS_D(sb->s_root)) {
kfree(UNIONFS_D(sb->s_root)->lower_paths);
- free_dentry_private_data(UNIONFS_D(sb->s_root));
+ free_dentry_private_data(sb->s_root);
}
dput(sb->s_root);
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index aafd2a2..707e306 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -254,9 +254,8 @@ static inline void unionfs_double_lock_dentry(struct dentry
*d1,
unionfs_lock_dentry(d2);
}
-extern int realloc_dentry_private_data(struct dentry *dentry);
extern int new_dentry_private_data(struct dentry *dentry);
-extern void free_dentry_private_data(struct unionfs_dentry_info *udi);
+extern void free_dentry_private_data(struct dentry *dentry);
extern void update_bstart(struct dentry *dentry);
/*
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
