commit 188b91b0ef56f55525c2755e02c16cb5da2341c6
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Wed May 30 15:51:27 2007 -0400
removed super_block * from odf_get_opaque args
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index 86455f2..41065c4 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -227,7 +227,7 @@ int check_empty(struct dentry *dentry, struct
unionfs_dir_state **namelist)
bstart = dbstart(dentry);
bend = dbend(dentry);
- bopaque = odf_get_opaque(sb, dentry);
+ bopaque = odf_get_opaque(dentry);
if (0 <= bopaque && bopaque < bend)
bend = bopaque;
@@ -359,7 +359,7 @@ retry:
bstart = dbstart(d_upper);
bend = dbend(d_upper);
- bopaque = odf_get_opaque(sb, d_upper);
+ bopaque = odf_get_opaque(d_upper);
if (0 <= bopaque && bopaque < bend)
bend = bopaque;
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 718b007..86b24f0 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -103,7 +103,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
}
/* if opaque dir lookup only until opaque branch */
else if
(S_ISDIR(UNIONFS_D(dentry)->odf.dentry->d_inode->i_mode)) {
- bopaque = odf_get_opaque(dentry->d_sb, dentry);
+ bopaque = odf_get_opaque(dentry);
if (bopaque != -1)
bend = bopaque;
}
@@ -111,7 +111,7 @@ struct dentry *unionfs_lookup_backend(struct dentry *dentry,
}
if (bopaque == -1)
- bopaque = odf_get_opaque(parent_dentry->d_sb, parent_dentry);
+ bopaque = odf_get_opaque(parent_dentry);
BUG_ON(bstart < 0);
/* It would be ideal if we could convert partial lookups to only have
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 3b52481..77c1f9e 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -92,7 +92,7 @@ struct dentry *unionfs_interpose(struct dentry *dentry,
struct super_block *sb,
err = -ENOENT;
goto out;
}
- opaque = odf_get_opaque(sb, dentry);
+ opaque = odf_get_opaque(dentry);
if (opaque >= 0)
set_dbend(dentry, opaque);
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 5ecdf17..72f0ee9 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -1553,8 +1553,9 @@ out:
* which is not necessarily the same as the branch position, so we need to
* convert the branch id to the branch position
*/
-int odf_get_opaque(struct super_block *sb, struct dentry *dentry)
+int odf_get_opaque(struct dentry *dentry)
{
+ struct super_block *sb = dentry->d_sb;
int i, opaque;
BUG_ON(!UNIONFS_D(dentry)->odf.dentry);
diff --git a/fs/unionfs/odf.h b/fs/unionfs/odf.h
index 2a38f33..1ce8dcd 100644
--- a/fs/unionfs/odf.h
+++ b/fs/unionfs/odf.h
@@ -57,7 +57,7 @@ int odf_remove(struct dentry *dentry, int flags);
int odf_create_wh(struct dentry *dentry);
/* opaque */
-int odf_get_opaque(struct super_block *sb, struct dentry *dentry);
+int odf_get_opaque(struct dentry *dentry);
extern void __odf_cleanup(void *args);
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index cce4d51..c456144 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -157,7 +157,7 @@ static int do_unionfs_rename(struct inode *old_dir,
new_bstart = dbstart(new_dentry);
new_bend = dbend(new_dentry);
- new_opaque = odf_get_opaque(new_dentry->d_parent->d_sb,
new_dentry->d_parent);
+ new_opaque = odf_get_opaque(new_dentry->d_parent);
/* if dst does not exist, set its start branch the same as src */
if (new_bstart == new_bend && new_bstart == 0) {
@@ -319,14 +319,14 @@ static int may_rename_dir(struct dentry *dentry, struct
dentry *new_dir)
return -EXDEV;
/* if new dir is opaque we may have to copyup */
- opaque = odf_get_opaque(new_dir->d_sb, new_dir);
+ opaque = odf_get_opaque(new_dir);
if (opaque != -1 && opaque < bstart)
return -EXDEV;
} else if (err)
return err;
- if (dbend(dentry) == bstart || odf_get_opaque(dentry->d_sb, dentry) ==
bstart)
+ if (dbend(dentry) == bstart || odf_get_opaque(dentry) == bstart)
return 0;
set_dbstart(dentry, bstart + 1);
diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
index 7a4ec08..8db863d 100644
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -27,7 +27,7 @@ static int unionfs_do_unlink(struct inode *dir, struct dentry
*dentry)
struct iattr attr;
int opaque;
- opaque = odf_get_opaque(dentry->d_sb,dentry->d_parent);
+ opaque = odf_get_opaque(dentry->d_parent);
if ((err = unionfs_partial_lookup(dentry)))
goto out;
@@ -162,7 +162,7 @@ static int unionfs_do_rmdir(struct inode *dir, struct
dentry *dentry)
break;
}
/* FIXME: create wh for opaque dirs as well? or force to check all
branches? */
- if (err || odf_get_opaque(dentry->d_sb, dentry) != 1) {
+ if (err || odf_get_opaque(dentry) != 1) {
if (err == -EIO)
printk(KERN_WARNING
"unionfs_rmdir: IO error removing from branch
%d\n",
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
