commit bb66d020ecf9526d3d51b7bca573c125cc86fca3
Author: Erez_Zadok <[EMAIL PROTECTED]>
Date: Sat Mar 24 19:31:28 2007 -0400
cleanup: remove unnecessary blank lines in short code blocks
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 693e34d..ede3eef 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -701,7 +701,6 @@ static int unionfs_mknod(struct inode *dir, struct dentry
*dentry, int mode,
if (err) {
if (!IS_COPYUP_ERR(err))
goto out;
-
bstart--;
} else
whiteout_unlinked = 1;
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 8e5f419..67412be 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -295,7 +295,6 @@ out_negative:
if (lookupmode == INTERPOSE_REVAL) {
if (dentry->d_inode)
UNIONFS_I(dentry->d_inode)->stale = 1;
-
goto out;
}
/* This should only happen if we found a whiteout. */
diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c
index 4318638..4f1b355 100644
--- a/fs/unionfs/subr.c
+++ b/fs/unionfs/subr.c
@@ -82,7 +82,6 @@ int create_whiteout(struct dentry *dentry, int start)
hidden_wh_dentry,
~current->fs->umask & S_IRWXUGO,
NULL);
-
}
unlock_dir(hidden_dir_dentry);
dput(hidden_wh_dentry);
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 2094992..25380f3 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -88,7 +88,6 @@ static void unionfs_put_inode(struct inode *inode)
static void unionfs_delete_inode(struct inode *inode)
{
inode->i_size = 0; /* every f/s seems to do that */
-
clear_inode(inode);
}
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 77abb4d..664caff 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -353,16 +353,13 @@ struct dentry *unionfs_lookup_backend(struct dentry
*dentry,
static inline int branchperms(const struct super_block *sb, int index)
{
BUG_ON(index < 0);
-
return UNIONFS_SB(sb)->data[index].branchperms;
}
static inline int set_branchperms(struct super_block *sb, int index, int perms)
{
BUG_ON(index < 0);
-
UNIONFS_SB(sb)->data[index].branchperms = perms;
-
return perms;
}
diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
index 27b4542..2052270 100644
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -51,7 +51,6 @@ static int unionfs_unlink_whiteout(struct inode *dir, struct
dentry *dentry)
if (err) {
if (dbstart(dentry) == 0)
goto out;
-
err = create_whiteout(dentry, dbstart(dentry) - 1);
} else if (dbopaque(dentry) != -1)
/* There is a hidden lower-priority file with the same name. */
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
