commit 849475b349febc9067f42fae1e0654dcefe915b2
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sun Apr 29 21:30:48 2007 -0400
removed duplicate/uneeded defines as result of rebasing
diff --git a/fs/unionfs/odf.h b/fs/unionfs/odf.h
index be292e9..c4b989c 100644
--- a/fs/unionfs/odf.h
+++ b/fs/unionfs/odf.h
@@ -1,8 +1,6 @@
#ifndef _ODF_H_
#define _ODF_H_
-#include "../ext2/ext2.h"
-
#define UUID_LEN 16
#define ODF_VERSION_MINOR 0
#define ODF_VERSION_MAJOR 1
@@ -17,11 +15,6 @@
#define ODF_OPTIONS_LEN 255
#define ODF_INAME_LEN 10
-/* Some string constants */
-#define ODF_BRANCH_PATH 255
-#define ODF_OPTIONS_LEN 255
-#define ODF_INAME_LEN 10
-
/* Lookup flags (what to create if lookup fails) */
#define ODF_LOOKUP_FILE 1
#define ODF_LOOKUP_DIR 2
@@ -36,11 +29,6 @@
#define ODF_RMV_NOTWH 2
#define ODF_RMV_ANY (ODF_RMV_WH|ODF_RMV_NOTWH)
-/* Unlink/Remove flags */
-#define ODF_RMV_WH 1
-#define ODF_RMV_NOTWH 2
-#define ODF_RMV_ANY (ODF_RMV_WH|ODF_RMV_NOTWH)
-
#define ODF_DIRENT_MAGIC 0x0DFD1300
/* special filenames */
@@ -54,23 +42,6 @@
#define ODF_CLEAN_INODES 3
#define ODF_CLEAN_BLOCKS 4
-#define ODF_DIRENT_MAGIC 0x0DFD1300
-
-/* Reclaim thread timeout */
-#define ODF_CL_TIMEOUT 30 /* seconds */
-#define ODF_CL_PCNT_I 25 /* cleanup ic when % of free inodes goes below this
val */
-#define ODF_CL_PCNT_B 30 /* cleanup ic when % of free blocks goes below this
val */
-
-#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
-#define ODF_CLEAN_BLOCKS 4
-
/* 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
