From: Erez_Zadok <ezk@cs.sunysb.edu>
Date: Fri, 1 Jun 2007 03:40:19 +0000 (-0400)
Subject: cleanup: ensure that all comment markers have spaces inside
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=d09db35c707fcd4bc68e7b3445db829072b7afb0;p=unionfs-odf.git

cleanup: ensure that all comment markers have spaces inside

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/config.c b/fs/unionfs/config.c
index aaa48ff40c..f2a532f0aa 100644
--- a/fs/unionfs/config.c
+++ b/fs/unionfs/config.c
@@ -294,4 +294,4 @@ void unionfs_config_exit(void)
 	configfs_unregister_subsystem(&unionfs_subsys);
 }
 
-#endif /*CONFIG_CONFIGFS_FS*/
+#endif /* CONFIG_CONFIGFS_FS */
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index 6f34d11c4c..099e5a4150 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -49,7 +49,7 @@ struct unionfs_rdutil_callback {
 	int mode;
 };
 
-/* callback structure for odf_cleanup*/
+/* callback structure for odf_cleanup */
 struct unionfs_cleanup_callback {
 	int err;
 	int filldir_called;
diff --git a/fs/unionfs/export.c b/fs/unionfs/export.c
index 97e1e8794a..ad02098a97 100644
--- a/fs/unionfs/export.c
+++ b/fs/unionfs/export.c
@@ -174,7 +174,7 @@ out:
 	return res;
 }
 
-/**
+/*
  * @dentry: the directory in which to find a name
  * @name:   a pointer to a %NAME_MAX+1 char buffer to store the name
  * @child:  the dentry for the child directory.
diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index 24a14b3cb5..62da4e4268 100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -18,10 +18,6 @@
 
 #include "union.h"
 
-/*******************
- * File Operations *
- *******************/
-
 static ssize_t unionfs_read(struct file *file, char __user *buf,
 			    size_t count, loff_t *ppos)
 {
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 49c3e0e1bd..2a9257455f 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -561,7 +561,7 @@ static int unionfs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 		goto out;
 	}
 
-	/* update odf and remove any wh before interpose*/
+	/* update odf and remove any wh before interpose */
 	err = odf_lookup(dentry->d_parent, dentry,
 			 ODF_LOOKUP_FILE|ODF_LOOKUP_RMV_WH);
 	if (!err)
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 5355452631..b6b4f2925e 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -519,7 +519,7 @@ out:
 	return err;
 }
 
-/* Links two entries in the odf	*/
+/* Links two entries in the odf */
 int odf_link(struct dentry *old_dentry, struct dentry *new_dentry)
 {
 	struct dentry *old_dir, *new_dir;
@@ -750,7 +750,7 @@ int odf_copyup_link(struct super_block *sb, struct dentry *old_dentry,
 	/* get the odf ino first */
 	link_file->f_pos = 0;
 
-	/* write destination branch id*/
+	/* write destination branch id */
 	le32 = cpu_to_le32(branch_id(sb, new_branch));
 	err = link_file->f_op->write(link_file, (char*)&le32,
 				     sizeof(__le32), &link_file->f_pos);
@@ -1870,7 +1870,7 @@ char *odf_read_sb_data(struct odf_sb_info *odf_sb, int **bid)
 	unsigned char uuid[UUID_LEN];
 	__le32 le32;
 
-	options = kzalloc(ODF_OPTIONS_LEN, GFP_KERNEL); /*XXX*/
+	options = kzalloc(ODF_OPTIONS_LEN, GFP_KERNEL); /* XXX */
 	branch_entry = kzalloc(ODF_BRANCH_PATH, GFP_KERNEL);
 	if (!options || !branch_entry) {
 		err = -ENOMEM;
@@ -1983,7 +1983,7 @@ char *odf_read_sb_data(struct odf_sb_info *odf_sb, int **bid)
 			goto out_close;
 		}
 
-		/* permissions*/
+		/* permissions */
 		err = file->f_op->read(file, (char*)&le32, sizeof(__le32),
 				       &file->f_pos);
 		if (err != sizeof(__le32)) {
@@ -1992,7 +1992,7 @@ char *odf_read_sb_data(struct odf_sb_info *odf_sb, int **bid)
 		}
 		perms = le32_to_cpu(le32);
 
-		/* branch UUID*/
+		/* branch UUID */
 		err = file->f_op->read(file, (char*)uuid, UUID_LEN,
 				       &file->f_pos);
 		if (err != UUID_LEN) {