Unionfs ODF: Fix configfs related compilation errors

Removing unnecessary braces in #define members which confused snprintf
in unionfs_read_help().  Also, fixed the mutex initialization.

Signed-off-by: Rachita Kothiyal <rachita.fsl.cs.sunysb.edu>

diff --git a/fs/unionfs/config.c b/fs/unionfs/config.c
index 493fe06499de8542844cb63f73a923e5a48e7d9d..a63ea5cf34834a714f9de5f8c3ec425ab4970e49 100644 (file)
--- a/fs/unionfs/config.c
+++ b/fs/unionfs/config.c
@@ -78,6 +78,7 @@ inline int unionfs_config_init(void)
 #else  /* configfs specific code starts here */
 
 #include <linux/configfs.h>
+#include <linux/mutex.h>
 
 #define DEPEND_MAX 1
 #define DEPEND_MIN 2
@@ -285,7 +286,7 @@ int unionfs_config_init(void)
        int err;
 
        config_group_init(&unionfs_subsys.su_group);
-       init_MUTEX(&unionfs_subsys.su_sem);
+       mutex_init(&unionfs_subsys.su_mutex);
        err = configfs_register_subsystem(&unionfs_subsys);
        if (err)
                printk(KERN_ERR

diff --git a/fs/unionfs/config.h b/fs/unionfs/config.h
index 08a7a5f5d72cd974c5c3386924d0f2e25866da30..d799b689bbc5d176f521609ff1b2415c00585a7d 100644 (file)
--- a/fs/unionfs/config.h
+++ b/fs/unionfs/config.h
@@ -17,38 +17,38 @@
 #define TIMEOUT_MIN 1
 #define TIMEOUT_MAX 1000000
 #define TIMEOUT_DEF 30
-#define TIMEOUT_INFO ("defaults to %d seconds.  Controls the interval when " \
-                     "the ODF\ncleanup thread will wake up.")
+#define TIMEOUT_INFO "defaults to %d seconds.  Controls the interval when " \
+                     "the ODF\ncleanup thread will wake up."
 #define THRESH_BH "block_high_thresh"
 #define THRESH_BH_MIN 1
 #define THRESH_BH_MAX 99
 #define THRESH_BH_DEF 80
-#define THRESH_BH_INFO ("defaults to %d%%.  The threshold of consumed disk " \
+#define THRESH_BH_INFO "defaults to %d%%.  The threshold of consumed disk " \
                        "blocks in\n/odf, above which we begin cleaning.  " \
-                       "Must be higher than the value of\n" THRESH_BL)
+                       "Must be higher than the value of\n" THRESH_BL
 #define THRESH_BL "block_low_thresh"
 #define THRESH_BL_MIN 1
 #define THRESH_BL_MAX 99
 #define THRESH_BL_DEF 70
-#define THRESH_BL_INFO ("defaults to %d%%.  The threshold of consumed disk " \
+#define THRESH_BL_INFO "defaults to %d%%.  The threshold of consumed disk " \
                        "blocks in\n/odf, we try to bring the system to " \
                        "after we begin cleaning.  Must be\nlower the " \
-                       "value of " THRESH_BH)
+                       "value of " THRESH_BH
 #define THRESH_IH "inode_high_thresh"
 #define THRESH_IH_MIN 1
 #define THRESH_IH_MAX 99
 #define THRESH_IH_DEF 80
-#define THRESH_IH_INFO ("defaults to %d%%.  The threshold of consumed inodes" \
+#define THRESH_IH_INFO "defaults to %d%%.  The threshold of consumed inodes" \
                        " in /odf,\nabove which we begin cleaning.  Must " \
-                       "be higher than the value of " THRESH_IL)
+                       "be higher than the value of " THRESH_IL
 #define THRESH_IL "inode_low_thresh"
 #define THRESH_IL_MIN 1
 #define THRESH_IL_MAX 99
 #define THRESH_IL_DEF 70
-#define THRESH_IL_INFO ("defaults to %d%%.  The threshold of consumed inodes" \
+#define THRESH_IL_INFO "defaults to %d%%.  The threshold of consumed inodes" \
                        " in /odf,\nwe try to bring the system to after we " \
                        "begin cleaning. Must be lower than\nthe value of " \
-                       THRESH_IH)
+                       THRESH_IH
 #define HELP_NAME "help"
 
 struct unionfs_attribute {