commit d5d51062ed4bb68bc8512cfc1b4157b66f74593d
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
86455f2e219b16170dc5dbc31300658cd5f8a95b..41065c472a3d5e2b42f0c38afb1dae7ba2f68285
100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -227,7 +227,7 @@ int check_empty(struct dentry *dentry, s
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
718b00733c5593880f09fb9fb0ad148aba14215b..86b24f076f6072b7a94d69db7e2ad7151669d1eb
100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -103,7 +103,7 @@ struct dentry *unionfs_lookup_backend(st
}
/* 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(st
}
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
3b5248164e207d561a98dbbf72238bb1ed9bab47..77c1f9ec55be4867a1e2fe327ebdcda86613370d
100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -92,7 +92,7 @@ struct dentry *unionfs_interpose(struct
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
5ecdf17a7d8164022436278dc83279bd014c85b9..72f0ee9e606c921c885b8e0eef55d749e486814d
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
2a38f33123d9e47c55b75e0edc8e7238a5983d80..1ce8dcd5f2d538814a0796d708c2f8bf1129c343
100644
--- a/fs/unionfs/odf.h
+++ b/fs/unionfs/odf.h
@@ -57,7 +57,7 @@ int odf_remove(struct dentry *dentry, in
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
cce4d51fc3f0400cad1d3dd833d24772cf6f68fd..c456144ab8f03e637eda5d0a7d09695e6e973a71
100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -157,7 +157,7 @@ static int do_unionfs_rename(struct inod
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
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
7a4ec0822f2a4ff2f4fa1fca25d9ea26f66bb2ee..8db863d60f47b22e2f34de8f9c476dd9120f814b
100644
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -27,7 +27,7 @@ static int unionfs_do_unlink(struct inod
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
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
