commit 279ff5f2e12164f216d6e7521c04dd22b8877a75
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
309f0eb54756301ef8a171e5ee13e5f4dce75412..020ebccbb1865d3a2eb6d76713c05c172f4be12f
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
c4f862440c75b9d7ce65313a5fe86a74a8ab3660..5a36cefef92f9cc02451d54095c8336074e6875e
100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -96,7 +96,7 @@ struct dentry *unionfs_interpose(struct
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
4ec070f5f782e9587a0b27cfc34fd04591d2ff86..215f53a455980b1f7b52b134e0479bca350c3c2d
100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -1847,7 +1847,6 @@ struct odf_dentry_info *odf_alloc_info(s
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(st
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
0ae45203aa7aea1f5d522b4f899f84b24152d27c..8df314db8f5adb38fea848fde4c0d60bdee97b80
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
