commit 9bac9d1f7bff0c7d7f853b8577202190cf65cb49
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Sun Jul 27 22:47:14 2008 -0400
Unionfs: simplify stale-inode detection code
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index 919cbdb..d602ad7 100644
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -18,6 +18,20 @@
#include "union.h"
+bool is_negative_lower(const struct dentry *dentry)
+{
+ int bindex;
+ struct dentry *lower_dentry;
+
+ BUG_ON(!dentry || dbstart(dentry) < 0);
+ for (bindex = dbstart(dentry); bindex <= dbend(dentry); bindex++) {
+ lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
+ /* XXX: what if lower_dentry is NULL? */
+ if (lower_dentry && lower_dentry->d_inode)
+ return false;
+ }
+ return true;
+}
static inline void __dput_lowers(struct dentry *dentry, int start, int end)
{
@@ -113,7 +127,7 @@ static bool __unionfs_d_revalidate_one(struct dentry
*dentry,
dentry = result;
}
- if (unlikely(positive && UNIONFS_I(dentry->d_inode)->stale)) {
+ if (unlikely(positive && is_negative_lower(dentry))) {
make_bad_inode(dentry->d_inode);
d_drop(dentry);
valid = false;
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 988d0bd..497d37d 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -325,11 +325,9 @@ out_negative:
goto out;
/* If we've only got negative dentries, then use the leftmost one. */
- if (lookupmode == INTERPOSE_REVAL) {
- if (dentry->d_inode)
- UNIONFS_I(dentry->d_inode)->stale = 1;
+ if (lookupmode == INTERPOSE_REVAL)
goto out;
- }
+
if (!lower_dir_dentry) {
err = -ENOENT;
goto out;
@@ -434,7 +432,6 @@ out:
!UNIONFS_I(dentry->d_inode)->lower_inodes)) {
unionfs_mntput(dentry->d_sb->s_root, bstart);
dput(first_lower_dentry);
- UNIONFS_I(dentry->d_inode)->stale = 1;
}
}
kfree(whname);
@@ -443,9 +440,6 @@ out:
unionfs_unlock_dentry(dentry);
if (!err && d_interposed)
return d_interposed;
- if (dentry->d_inode && UNIONFS_I(dentry->d_inode)->stale &&
- first_dentry_offset >= 0)
- unionfs_mntput(dentry->d_sb->s_root, first_dentry_offset);
return ERR_PTR(err);
}
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 96ca46d..67a44d7 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -83,25 +83,13 @@ struct dentry *unionfs_interpose(struct dentry *dentry,
struct super_block *sb,
{
int err = 0;
struct inode *inode;
- int is_negative_dentry = 1;
- int bindex, bstart, bend;
int need_fill_inode = 1;
struct dentry *spliced = NULL;
verify_locked(dentry);
- bstart = dbstart(dentry);
- bend = dbend(dentry);
-
/* Make sure that we didn't get a negative dentry. */
- for (bindex = bstart; bindex <= bend; bindex++) {
- if (unionfs_lower_dentry_idx(dentry, bindex) &&
- unionfs_lower_dentry_idx(dentry, bindex)->d_inode) {
- is_negative_dentry = 0;
- break;
- }
- }
- BUG_ON(is_negative_dentry);
+ BUG_ON(is_negative_lower(dentry));
/*
* We allocate our new inode below, by calling iget.
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index b0f0eda..fde19c1 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -109,7 +109,6 @@ struct unionfs_inode_info {
int bstart;
int bend;
atomic_t generation;
- int stale;
/* Stuff for readdir over NFS. */
spinlock_t rdlock;
struct list_head readdircache;
@@ -384,6 +383,7 @@ extern bool __unionfs_d_revalidate_one_locked(struct dentry
*dentry,
bool willwrite);
extern bool __unionfs_d_revalidate_chain(struct dentry *dentry,
struct nameidata *nd, bool willwrite);
+extern bool is_negative_lower(const struct dentry *dentry);
extern bool is_newer_lower(const struct dentry *dentry);
extern void purge_sb_data(struct super_block *sb);
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
