commit 7aae44877243cb33c1b39301012bce19e0b918d8
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Apr 21 11:48:37 2007 -0400
cleanup: remove unnecessary blank lines in short code blocks
Conflicts:
fs/unionfs/inode.c
fs/unionfs/subr.c
fs/unionfs/unlink.c
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 9b67369..3f22713 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -201,7 +201,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/super.c b/fs/unionfs/super.c
index c250a22..1a508ce 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 4cd0961..8b9fd76 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -382,16 +382,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;
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
