commit d5e8fd8683fd40317e4e6406fffe91594b444278
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Fri May 25 14:23:21 2007 -0400
removed the odf_sb_info field from the odf_dentry_info struct
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 215f53a..78af658 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -1326,7 +1326,7 @@ int odf_create_wh(struct dentry *dentry)
struct dentry *odf_dentry;
if (UNIONFS_D(dentry)->odf_info) {
odf_dentry = UNIONFS_D(dentry)->odf_info->dentry;
- if (__odf_is_wh(UNIONFS_D(dentry)->odf_info->osi, odf_dentry))
+ if (__odf_is_wh(UNIONFS_SB(dentry->d_sb)->odf, odf_dentry))
goto out; /* nothing to be done */
/* remove entry if existed */
err = odf_remove(dentry, ODF_RMV_ANY);
@@ -1377,7 +1377,7 @@ int odf_remove(struct dentry *dentry, int flags)
if (!odi)
goto out;
/* should we remove? */
- if (__odf_is_wh(odi->osi, odi->dentry)) {
+ if (__odf_is_wh(UNIONFS_SB(dentry->d_sb)->odf, odi->dentry)) {
if (flags & ODF_RMV_WH)
rmv = 1;
}
@@ -1847,7 +1847,6 @@ struct odf_dentry_info *odf_alloc_info(struct odf_sb_info
*osi, struct dentry *o
odi->whiteout = __odf_is_wh(osi, odf_dentry);
odi->opaque = __odf_get_opaque(odf_dentry->d_inode);
odi->dentry = odf_dentry;
- odi->osi = osi;
dget(odf_dentry);
return odi;
}
@@ -1860,7 +1859,6 @@ struct odf_dentry_info *odf_fill_info(struct
odf_dentry_info *odi, struct odf_sb
dget(odf_dentry);
dput(odi->dentry);
odi->dentry = odf_dentry;
- odi->osi = osi;
return odi;
}
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 8df314d..824dd64 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -98,7 +98,6 @@ struct odf_dentry_info {
int whiteout;
int opaque;
struct dentry *dentry;
- struct odf_sb_info *osi;
};
/* odf sb data */
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
