commit 042038018449c67f7aa55944680edadbc2c922b4
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
bf1723591123339e4df6f9a487b2b662086b833c..b64b38aef9f3d201048306841ab821c9d6d9d031
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
bd91fcb104898aea8a27179cc0e11cb7de64c116..55aa7f0396c0c693b5c5cf93311150d12122d621
100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -88,7 +88,6 @@ static void unionfs_put_inode(struct ino
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
cfb504e4616d37346fe0a4a7e9d8dfec3c2cc76a..84fc8d0143c0d26b8b64afd08ca72f0cd329b1af
100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -371,16 +371,13 @@ #define IS_WRITE_FLAG(flag) ((flag) & OP
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
