commit cc51d8467be3f5594b0b596b0e763fa82d5b7165
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Tue May 22 16:14:45 2007 -0400
added odf/sr to odf structure, that will contain odf silly renamed files
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index
82e1be54d6fee750092c71d58df6fabc64906853..04c4172f0d9c7362df3c0c9006b11c35c53a7925
100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -54,6 +54,13 @@ int __odf_create_hierarchy(struct dentry
goto out;
}
dput(dentry);
+ dentry = __odf_create_dir(odf_root, ODF_SR);
+ if (IS_ERR(dentry)){
+ err = PTR_ERR(dentry);
+ dentry = NULL;
+ goto out;
+ }
+ dput(dentry);
dentry = lookup_one_len(ODF_WH_NAME, odf_root, ODF_WH_LEN);
if (IS_ERR(dentry)) {
err = PTR_ERR(dentry);
@@ -150,6 +157,13 @@ struct odf_sb_info* odf_read_super(char
goto out_free;
}
+ osi->odi_sr = odf_getpath(nd.dentry, osi, ODF_SR);
+ if (IS_ERR(osi->odi_sr)){
+ err = PTR_ERR(osi->odi_sr);
+ osi->odi_sr = NULL;
+ goto out_free;
+ }
+
osi->whiteout = lookup_one_len(ODF_WH_NAME, nd.dentry, ODF_WH_LEN);
if (IS_ERR(osi->whiteout)) {
err = PTR_ERR(osi->whiteout);
@@ -203,6 +217,7 @@ void odf_put_super(struct odf_sb_info *o
/* do not put ns here, as it will be put by root of UnionFs*/
odf_put_info(osi->odi_rc);
odf_put_info(osi->odi_ic);
+ odf_put_info(osi->odi_sr);
dput(osi->mnt->mnt_sb->s_root);
dput(osi->sb);
dput(osi->whiteout);
diff --git a/fs/unionfs/odf.h b/fs/unionfs/odf.h
index
b9a558a6c62b490cd8b07aed1866c8270d365414..8f408c3e6e5d4abe44d8205c144f539d35a307d6
100644
--- a/fs/unionfs/odf.h
+++ b/fs/unionfs/odf.h
@@ -9,6 +9,7 @@ #define ODF_SB "sb"
#define ODF_IC "ic"
#define ODF_RC "reclaim"
#define ODF_NS "ns"
+#define ODF_SR "sr"
/* Some string constants */
#define ODF_BRANCH_PATH 255
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index
c082bd4b382eb2503ff2fb9d3257a622b80139d9..258d69e614a1779846128a42dac726d610915c00
100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -112,6 +112,7 @@ struct odf_sb_info {
struct odf_dentry_info *odi_ns; /* namespace (/ns) */
struct odf_dentry_info *odi_rc; /* reclaim (/reclaim) */
struct odf_dentry_info *odi_ic; /* inode cache (/ic) */
+ struct odf_dentry_info *odi_sr; /* silly renamed files (/sr) */
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-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
