commit ead5e3af5e6d022ae306502df6fd0fd99446626c
Author: Erez_Zadok <[EMAIL PROTECTED]>
Date: Fri Jun 1 00:00:05 2007 -0400
put '}' of code block on same line as "else {"
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index 7b7fac4..e8a1e4b 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -167,8 +167,7 @@ static int readdir_util_callback(void *dirent, const char
*name, int namelen,
if (PTR_ERR(odf_dentry) == -ENOENT) {
odf_dentry = NULL;
not_in_odf = 1;
- }
- else {
+ } else {
odf_dentry = NULL;
goto out;
}
diff --git a/fs/unionfs/export.c b/fs/unionfs/export.c
index 78e68c3..cb0f150 100644
--- a/fs/unionfs/export.c
+++ b/fs/unionfs/export.c
@@ -55,8 +55,7 @@ static struct dentry *__get_parent(struct super_block *sb,
d = d->d_parent;
if (d != odf_root)
dget(d);
- }
- else {
+ } else {
/*
* if the odf dentry is disconnected we get its
* parent by calling get_parent on the odf fs
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index eb858b5..6a0f7a4 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -207,8 +207,7 @@ static int unionfs_link(struct dentry *old_dentry, struct
inode *dir,
unionfs_set_lower_mnt_idx(new_dentry, 0, NULL);
}
- }
- else {
+ } else {
err = -EROFS;
goto docopyup;
}
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 4e87eed..6893dba 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -1186,8 +1186,7 @@ struct dentry *__odf_lookup(struct dentry *parent,
current->fsuid = 0;
current->fsgid = 0;
err = vfs_mkdir(odf_i_dir, odf_dentry, S_IRWXUGO);
- }
- else {
+ } else {
dput(odf_dentry);
odf_dentry = ERR_PTR(-ENOENT);
goto out;
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index b1d42b5..942d1e7 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -214,8 +214,7 @@ static int do_unionfs_rename(struct inode *old_dir,
old_dentry->d_inode->i_mode);
if (err)
goto revert;
- }
- else {
+ } else {
/* otherwise do regular copyup & rename */
err = copyup_dentry(old_dentry->d_parent->d_inode,
old_dentry, old_bstart, bindex,
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
