commit a2608d4a56dff12486a29b3c7221c33d7795ad2d
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Wed May 30 20:41:07 2007 -0400
bug fixes: revalidate dentries passed to all inode/super operations
Be sure to properly revalidate all dentry chains passed to all inode and
super_block operations. Remove the older BUG_ON test is_valid_dentry().
This should help improve cache-coherency.
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
Conflicts:
fs/unionfs/inode.c
fs/unionfs/union.h
fs/unionfs/unlink.c
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index b038dea..5063152 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -44,7 +44,7 @@ static int unionfs_create(struct inode *parent, struct dentry
*dentry,
valid = __unionfs_d_revalidate_chain(dentry->d_parent, nd);
unionfs_unlock_dentry(dentry->d_parent);
if (!valid) {
- err = -ENOENT; /* same as what real_lookup does */
+ err = -ESTALE; /* same as what real_lookup does */
goto out;
}
valid = __unionfs_d_revalidate_chain(dentry, nd);
@@ -131,6 +131,12 @@ static struct dentry *unionfs_lookup(struct inode *parent,
struct path path_save;
struct dentry *ret;
+ /*
+ * lookup is the only special function which takes a dentry, yet we
+ * do NOT want to call __unionfs_d_revalidate_chain because by
+ * definition, we don't have a valid dentry here yet.
+ */
+
/* save the dentry & vfsmnt from namei */
if (nd) {
path_save.dentry = nd->dentry;
@@ -163,11 +169,18 @@ static int unionfs_link(struct dentry *old_dentry, struct
inode *dir,
struct dentry *hidden_new_dentry = NULL;
struct dentry *hidden_dir_dentry = NULL;
- BUG_ON(!is_valid_dentry(new_dentry));
- BUG_ON(!is_valid_dentry(old_dentry));
-
unionfs_double_lock_dentry(new_dentry, old_dentry);
+ if (!__unionfs_d_revalidate_chain(old_dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+ if (new_dentry->d_inode &&
+ !__unionfs_d_revalidate_chain(new_dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
hidden_new_dentry = unionfs_lower_dentry(new_dentry);
if (dbstart(old_dentry) > dbstart(new_dentry)) {
@@ -298,10 +311,14 @@ static int unionfs_symlink(struct inode *dir, struct
dentry *dentry,
umode_t mode;
int bstart;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+ if (dentry->d_inode &&
+ !__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
/* We create in the leftmost branch. */
bstart = 0;
@@ -384,9 +401,14 @@ static int unionfs_mkdir(struct inode *parent, struct
dentry *dentry, int mode)
char *name = NULL;
int i, bend, bindex;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+
+ if (dentry->d_inode &&
+ !__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
bindex = 0; /* always create at branch 0 */
bend = dbend(dentry);
@@ -482,9 +504,14 @@ static int unionfs_mknod(struct inode *dir, struct dentry
*dentry, int mode,
struct dentry *hidden_parent_dentry = NULL;
int bstart;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+
+ if (dentry->d_inode &&
+ !__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
bstart = 0;
if (is_robranch_super(dentry->d_sb, bstart))
@@ -561,9 +588,13 @@ static int unionfs_readlink(struct dentry *dentry, char
__user *buf,
int err;
struct dentry *hidden_dentry;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
hidden_dentry = unionfs_lower_dentry(dentry);
if (!hidden_dentry->d_inode->i_op ||
@@ -591,7 +622,13 @@ static void *unionfs_follow_link(struct dentry *dentry,
struct nameidata *nd)
int len = PAGE_SIZE, err;
mm_segment_t old_fs;
- BUG_ON(!is_valid_dentry(dentry));
+ unionfs_lock_dentry(dentry);
+
+ if (dentry->d_inode &&
+ !__unionfs_d_revalidate_chain(dentry, nd)) {
+ err = -ESTALE;
+ goto out;
+ }
/* This is freed by the put_link method assuming a successful call. */
buf = kmalloc(len, GFP_KERNEL);
@@ -615,6 +652,7 @@ static void *unionfs_follow_link(struct dentry *dentry,
struct nameidata *nd)
err = 0;
out:
+ unionfs_unlock_dentry(dentry);
unionfs_check_dentry(dentry);
return ERR_PTR(err);
}
@@ -622,6 +660,11 @@ out:
static void unionfs_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
+ unionfs_lock_dentry(dentry);
+ if (!__unionfs_d_revalidate_chain(dentry, nd))
+ printk("unionfs: put_link failed to revalidate dentry\n");
+ unionfs_unlock_dentry(dentry);
+
unionfs_check_dentry(dentry);
kfree(nd_get_link(nd));
}
@@ -777,9 +820,13 @@ static int unionfs_setattr(struct dentry *dentry, struct
iattr *ia)
int i;
int copyup = 0;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
bstart = dbstart(dentry);
bend = dbend(dentry);
inode = dentry->d_inode;
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 42995e1..57188a2 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -343,11 +343,18 @@ int unionfs_rename(struct inode *old_dir, struct dentry
*old_dentry,
int err = 0;
struct dentry *hidden;
- BUG_ON(!is_valid_dentry(old_dentry));
- BUG_ON(!is_valid_dentry(new_dentry));
-
unionfs_double_lock_dentry(old_dentry, new_dentry);
+ if (!__unionfs_d_revalidate_chain(old_dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+ if (!d_deleted(new_dentry) && new_dentry->d_inode &&
+ !__unionfs_d_revalidate_chain(new_dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
if (!S_ISDIR(old_dentry->d_inode->i_mode))
err = unionfs_partial_lookup(old_dentry);
else
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index eb78a2a..209ae3b 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -117,8 +117,13 @@ static int unionfs_statfs(struct dentry *dentry, struct
kstatfs *buf)
struct super_block *sb;
struct dentry *lower_dentry;
- BUG_ON(!is_valid_dentry(dentry));
unionfs_check_dentry(dentry);
+ unionfs_lock_dentry(dentry);
+
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
sb = dentry->d_sb;
@@ -137,6 +142,8 @@ static int unionfs_statfs(struct dentry *dentry, struct
kstatfs *buf)
memset(&buf->f_fsid, 0, sizeof(__kernel_fsid_t));
memset(&buf->f_spare, 0, sizeof(buf->f_spare));
+out:
+ unionfs_unlock_dentry(dentry);
unionfs_check_dentry(dentry);
return err;
}
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index ff4f4ad..d96b983 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -398,19 +398,6 @@ static inline int is_robranch(const struct dentry *dentry)
return is_robranch_idx(dentry, index);
}
-/*
- * Check if dentry is valid or not, as per our generation numbers.
- * @dentry: dentry to check.
- * Returns 1 (valid) or 0 (invalid/stale).
- */
-static inline int is_valid_dentry(struct dentry *dentry)
-{
- BUG_ON(!UNIONFS_D(dentry));
- BUG_ON(!UNIONFS_SB(dentry->d_sb));
- return (atomic_read(&UNIONFS_D(dentry)->generation) ==
- atomic_read(&UNIONFS_SB(dentry->d_sb)->generation));
-}
-
#ifndef DEFAULT_POLLMASK
#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
#endif /* not DEFAULT_POLLMASK */
diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
index 8db863d..8302b1f 100644
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -96,12 +96,16 @@ int unionfs_unlink(struct inode *dir, struct dentry *dentry)
{
int err = 0;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_check_dentry(dentry);
unionfs_lock_dentry(dentry);
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
err = unionfs_do_unlink(dir, dentry);
+
/* call d_drop so the system "forgets" about us */
if (!err) {
/* If there was a whiteout created then the original
@@ -119,6 +123,7 @@ int unionfs_unlink(struct inode *dir, struct dentry *dentry)
d_drop(dentry);
}
+out:
unionfs_unlock_dentry(dentry);
return err;
}
@@ -197,11 +202,14 @@ int unionfs_rmdir(struct inode *dir, struct dentry
*dentry)
int err = 0;
struct unionfs_dir_state *namelist = NULL;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_check_dentry(dentry);
unionfs_lock_dentry(dentry);
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
/* check if this unionfs directory is empty or not */
err = check_empty(dentry, &namelist);
if (err)
diff --git a/fs/unionfs/xattr.c b/fs/unionfs/xattr.c
index 4cacead..bf8f1cf 100644
--- a/fs/unionfs/xattr.c
+++ b/fs/unionfs/xattr.c
@@ -57,14 +57,18 @@ ssize_t unionfs_getxattr(struct dentry *dentry, const char
*name, void *value,
struct dentry *hidden_dentry = NULL;
int err = -EOPNOTSUPP;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
hidden_dentry = unionfs_lower_dentry(dentry);
err = vfs_getxattr(hidden_dentry, (char*) name, value, size);
+out:
unionfs_unlock_dentry(dentry);
unionfs_check_dentry(dentry);
return err;
@@ -80,14 +84,19 @@ int unionfs_setxattr(struct dentry *dentry, const char
*name,
struct dentry *hidden_dentry = NULL;
int err = -EOPNOTSUPP;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
hidden_dentry = unionfs_lower_dentry(dentry);
err = vfs_setxattr(hidden_dentry, (char*) name, (void*) value,
size, flags);
+out:
unionfs_unlock_dentry(dentry);
unionfs_check_dentry(dentry);
return err;
@@ -102,13 +111,18 @@ int unionfs_removexattr(struct dentry *dentry, const char
*name)
struct dentry *hidden_dentry = NULL;
int err = -EOPNOTSUPP;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
hidden_dentry = unionfs_lower_dentry(dentry);
err = vfs_removexattr(hidden_dentry, (char*) name);
+out:
unionfs_unlock_dentry(dentry);
unionfs_check_dentry(dentry);
return err;
@@ -124,15 +138,19 @@ ssize_t unionfs_listxattr(struct dentry *dentry, char
*list, size_t size)
int err = -EOPNOTSUPP;
char *encoded_list = NULL;
- BUG_ON(!is_valid_dentry(dentry));
-
unionfs_lock_dentry(dentry);
+ if (!__unionfs_d_revalidate_chain(dentry, NULL)) {
+ err = -ESTALE;
+ goto out;
+ }
+
hidden_dentry = unionfs_lower_dentry(dentry);
encoded_list = list;
err = vfs_listxattr(hidden_dentry, encoded_list, size);
+out:
unionfs_unlock_dentry(dentry);
unionfs_check_dentry(dentry);
return err;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
