commit b40d552d622359b1297ea03e4ed0cfd4118f21c0
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Tue May 29 20:47:37 2007 -0400
removed opaque_branch_id field from unionfs_sb_info
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 79ceae7..3b52481 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -694,7 +694,6 @@ static int unionfs_read_super(struct super_block *sb, void
*raw_data,
}
if (high_bid > UNIONFS_SB(sb)->high_branch_id)
UNIONFS_SB(sb)->high_branch_id = high_bid;
- odf->opaque_branch_id = branch_id(sb, 0);
/* max Bytes is the maximum bytes from highest priority branch */
unionfs_read_lock(sb);
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 18b88ff..bfda834 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -1152,7 +1152,7 @@ retry:
}
/* set opaqueness to 0 or -1 */
- opaque = (flags & ODF_LOOKUP_OPQ) ? osi->opaque_branch_id : -1;
+ opaque = (flags & ODF_LOOKUP_OPQ)?branch_id(parent->d_sb, 0):-1;
__odf_set_opaque(odf_dentry, opaque);
}
else {
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index f62d2e6..eb78a2a 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -691,7 +691,6 @@ out_no_change:
err = odf_write_sb_data(odf, new_data, new_lower_paths, new_branches);
if (err)
goto out_release;
- odf->opaque_branch_id = new_data[0].branch_id;
/* if odf_keepcache is not set, wake up the cleanup thread and force
* it to cleanup everything
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 8daa7e4..0a6d54e 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -111,7 +111,6 @@ struct odf_sb_info {
struct dentry *whiteout; /* file whiteouts are linked to */
struct sioa_args *cleanup; /* our cleanup thread */
char *branch_uuids; /* not null terminated string of all branch uuids
*/
- int opaque_branch_id; /* should always be the branch id of branch 0*/
};
/* unionfs inode data in memory */
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
