From 0e5fedcbca14b3dd1dec81aed8300a8c90dbe6d7 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Sat, 24 Feb 2007 16:47:45 -0500 Subject: [PATCH] fs/unionfs/: Rename unionfs_d_revalidate_wrap Follow the convention of "foo" calling "__foo". Signed-off-by: Josef 'Jeff' Sipek --- fs/unionfs/commonfops.c | 2 +- fs/unionfs/dentry.c | 9 ++++----- fs/unionfs/union.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c index 66d6ce9e07b..2664be9feb4 100644 --- a/fs/unionfs/commonfops.c +++ b/fs/unionfs/commonfops.c @@ -228,7 +228,7 @@ int unionfs_file_revalidate(struct file *file, int willwrite) unionfs_lock_dentry(dentry); sb = dentry->d_sb; unionfs_read_lock(sb); - if (!unionfs_d_revalidate(dentry, NULL) && !d_deleted(dentry)) { + if (!__unionfs_d_revalidate(dentry, NULL) && !d_deleted(dentry)) { err = -ESTALE; goto out_nofree; } diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c index ac4bf0e435c..cae48976b6d 100644 --- a/fs/unionfs/dentry.c +++ b/fs/unionfs/dentry.c @@ -21,7 +21,7 @@ /* * returns 1 if valid, 0 otherwise. */ -int unionfs_d_revalidate(struct dentry *dentry, struct nameidata *nd) +int __unionfs_d_revalidate(struct dentry *dentry, struct nameidata *nd) { int valid = 1; /* default is valid (1); invalid is 0. */ struct dentry *hidden_dentry; @@ -174,13 +174,12 @@ out: return valid; } -static int unionfs_d_revalidate_wrap(struct dentry *dentry, - struct nameidata *nd) +static int unionfs_d_revalidate(struct dentry *dentry, struct nameidata *nd) { int err; unionfs_lock_dentry(dentry); - err = unionfs_d_revalidate(dentry, nd); + err = __unionfs_d_revalidate(dentry, nd); unionfs_unlock_dentry(dentry); return err; @@ -226,7 +225,7 @@ out: } struct dentry_operations unionfs_dops = { - .d_revalidate = unionfs_d_revalidate_wrap, + .d_revalidate = unionfs_d_revalidate, .d_release = unionfs_d_release, }; diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h index 60276c7ab3b..bae3c76332e 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -296,7 +296,7 @@ extern int unionfs_rename(struct inode *old_dir, struct dentry *old_dentry, int unionfs_unlink(struct inode *dir, struct dentry *dentry); int unionfs_rmdir(struct inode *dir, struct dentry *dentry); -int unionfs_d_revalidate(struct dentry *dentry, struct nameidata *nd); +int __unionfs_d_revalidate(struct dentry *dentry, struct nameidata *nd); /* The values for unionfs_interpose's flag. */ #define INTERPOSE_DEFAULT 0 -- 2.43.0