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 <jsipek@cs.sunysb.edu>

diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index d38f1ae2c10b9b26971f1654048d9eeed38bf7d4..4c51fe530b88aac55afd6b0648de316364a80713 100644 (file)
--- 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 61c6119015983cb4e57fef81ac8e412f60da5a61..b4c489c50d39184582b737d30fca97946e637c10 100644 (file)
--- 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 e8eb67c6bfb2a82c1a50b5df031cb5c317538701..85eda2666aa0a0db976c8abd1d0de31dbcc05e92 100644 (file)
--- 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 aafd2a2a87f98761fe0de0b07a42ac36190d592d..707e30629db0ad3f48808fc7ff0c7f6212323710 100644 (file)
--- 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);
 
 /*