commit febae0ba33b333295d5b34f3487785ae2bae9433
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Fri May 25 14:16:08 2007 -0400
removed the inum field from odf_dentry_info struct
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index 309f0eb..020ebcc 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -180,7 +180,7 @@ find:
goto out;
if (odi)
- ino = odi->inum;
+ ino = odi->dentry->d_inode->i_ino;
err = odf_write_dirent(buf->filp, name, namelen, ino, d_type);
out:
odf_put_info(odi);
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index c4f8624..5a36cef 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -96,7 +96,7 @@ struct dentry *unionfs_interpose(struct dentry *dentry,
struct super_block *sb,
if (opaque >= 0)
set_dbend(dentry, opaque);
- ino = UNIONFS_D(dentry)->odf_info->inum;
+ ino = UNIONFS_D(dentry)->odf_info->dentry->d_inode->i_ino;
inode = iget(sb, ino);
if (!inode) {
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 4ec070f..215f53a 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -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->inum = odf_dentry->d_inode->i_ino;
odi->osi = osi;
dget(odf_dentry);
return odi;
@@ -1861,7 +1860,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->inum = odf_dentry->d_inode->i_ino;
odi->osi = osi;
return odi;
}
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 0ae4520..8df314d 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -95,7 +95,6 @@ struct odf_dentry_info {
* the data in the odf file. Right now i keep a dentry for easy
* lookup in the underlying ext2
*/
- u64 inum;
int whiteout;
int opaque;
struct dentry *dentry;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
