commit 4f791a9d1978089b29d6e598314f0561a69f9031
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Mar 17 21:05:11 2007 -0400
macros for name of content files
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index d262c73..c55c6a2 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -538,7 +538,7 @@ struct odf_dentry_info *odf_ic_dir(struct dentry *dir)
}
}
- odi_ret = __odf_lookup(odis[3], osi, "content", 7, ODF_LOOKUP_FILE,
NULL);
+ odi_ret = __odf_lookup(odis[3], osi, ODF_CONTENT, ODF_CONTENT_LEN,
ODF_LOOKUP_FILE, NULL);
if (IS_ERR(odi_ret)) {
err = PTR_ERR(odi_ret);
odi_ret = NULL;
@@ -929,7 +929,7 @@ char *odf_get_options(struct odf_sb_info *odf_sb)
sprintf(ptr,"dirs=");
ptr+=strlen(ptr);
- d_content = lookup_one_len("content", odf_sb->odi_sb->dentry,
strlen("content"));
+ d_content = lookup_one_len(ODF_CONTENT, odf_sb->odi_sb->dentry,
ODF_CONTENT_LEN);
if (IS_ERR(d_content) || !d_content) {
err = -EINVAL;
goto out_err;
@@ -1042,7 +1042,7 @@ int odf_put_options(struct super_block* sb_union, struct
unionfs_dentry_info *hi
d_odf_sb = UNIONFS_SB(sb_union)->odf->odi_sb->dentry;
odf_mnt = UNIONFS_SB(sb_union)->odf->mnt;
- d_content = lookup_one_len("content", d_odf_sb, strlen("content"));
+ d_content = lookup_one_len(ODF_CONTENT, d_odf_sb, ODF_CONTENT_LEN);
if (IS_ERR(d_content) || !d_content) {
err = -EINVAL;
goto out;
diff --git a/fs/unionfs/odf.h b/fs/unionfs/odf.h
index dd7b3f9..d83519b 100644
--- a/fs/unionfs/odf.h
+++ b/fs/unionfs/odf.h
@@ -42,6 +42,9 @@
/* Reclaim thread timeout */
#define ODF_RC_TIMEOUT 10000
+#define ODF_CONTENT "content"
+#define ODF_CONTENT_LEN 7
+
/* super */
struct odf_sb_info* odf_read_super(char *options);
void odf_put_super(struct odf_sb_info *osi);
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
