commit bb2b9a2663a02f39bc51341f77a3246ef4de1f76
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Thu May 24 23:24:55 2007 -0400
added comments for odf special filenames constants and grouped them together
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 70bd9c3..d49247f 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -61,7 +61,7 @@ int __odf_create_hierarchy(struct dentry *odf_root)
goto out;
}
dput(dentry);
- dentry = lookup_one_len(ODF_WH_NAME, odf_root, ODF_WH_LEN);
+ dentry = lookup_one_len(ODF_WH, odf_root, sizeof(ODF_WH) - 1);
if (IS_ERR(dentry)) {
err = PTR_ERR(dentry);
dentry = NULL;
@@ -164,7 +164,7 @@ struct odf_sb_info* odf_read_super(char *options)
goto out_free;
}
- osi->whiteout = lookup_one_len(ODF_WH_NAME, nd.dentry, ODF_WH_LEN);
+ osi->whiteout = lookup_one_len(ODF_WH, nd.dentry, sizeof(ODF_WH) - 1);
if (IS_ERR(osi->whiteout)) {
err = PTR_ERR(osi->whiteout);
osi->whiteout = NULL;
diff --git a/fs/unionfs/odf.h b/fs/unionfs/odf.h
index 6c20820..c128756 100644
--- a/fs/unionfs/odf.h
+++ b/fs/unionfs/odf.h
@@ -4,11 +4,15 @@
#define UUID_LEN 16
#define ODF_VERSION 2
-#define ODF_SB "sb"
-#define ODF_IC "ic"
-#define ODF_RC "reclaim"
-#define ODF_NS "ns"
-#define ODF_SR "sr"
+/* odf special filenames/dirnames */
+#define ODF_SB "sb" /* odf superblock file (/odf/sb) */
+#define ODF_IC "ic" /* inode cache dir (/odf/ic) */
+#define ODF_RC "reclaim" /* reclaim dir (/odf/reclaim) */
+#define ODF_NS "ns" /* namespace dir (/odf/ns) */
+#define ODF_SR "sr" /* sily rename dir (/odf/sr) */
+#define ODF_WH "whiteout" /* the file whiteouts are linked to */
+#define ODF_CONTENT "content" /* name of cached dirs file in /odf/ic */
+#define ODF_CONTENT_LEN (sizeof(ODF_CONTENT) - 1)
/* Some string constants */
#define ODF_BRANCH_PATH 255
@@ -31,12 +35,6 @@
#define ODF_DIRENT_MAGIC 0x0DFD1300
-/* special filenames */
-#define ODF_CONTENT "content"
-#define ODF_CONTENT_LEN 7
-#define ODF_WH_NAME "whiteout"
-#define ODF_WH_LEN 8
-
#define ODF_CLEAN_ALL 1
#define ODF_CLEAN_CACHE 2
#define ODF_CLEAN_INODES 3
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
