commit 3fa5221b31ab15a46409943b027a460068ff7b22
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Apr 21 11:51:11 2007 -0400
cleanup: keep all top-of-function automatic variables clustered together
Conflicts:
fs/unionfs/dirhelper.c
fs/unionfs/lookup.c
diff --git a/fs/unionfs/branchman.c b/fs/unionfs/branchman.c
index eba2221..3163e4e 100644
--- a/fs/unionfs/branchman.c
+++ b/fs/unionfs/branchman.c
@@ -28,7 +28,6 @@ int unionfs_ioctl_queryfile(struct file *file, unsigned int
cmd,
{
int err = 0;
fd_set branchlist;
-
int bstart = 0, bend = 0, bindex = 0;
struct dentry *dentry, *hidden_dentry;
diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 1cb03f1..bb83f8a 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -30,7 +30,6 @@ static int copyup_deleted_file(struct file *file, struct
dentry *dentry,
const int countersize = sizeof(counter) * 2;
const int nlen = sizeof(".unionfs") + i_inosize + countersize - 1;
char name[nlen + 1];
-
int err;
struct dentry *tmp_dentry = NULL;
struct dentry *hidden_dentry;
@@ -260,7 +259,6 @@ static int open_highest_file(struct file *file, int
willwrite)
int bindex, bstart, bend, err = 0;
struct file *hidden_file;
struct dentry *hidden_dentry;
-
struct dentry *dentry = file->f_dentry;
struct inode *parent_inode = dentry->d_parent->d_inode;
struct super_block *sb = dentry->d_sb;
@@ -354,7 +352,6 @@ int unionfs_file_revalidate(struct file *file, int
willwrite)
int sbgen, fgen, dgen;
int bstart, bend;
int size;
-
int err = 0;
dentry = file->f_dentry;
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index da23ad3..124f38d 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -622,10 +622,10 @@ static struct dentry *create_parents_named(struct inode
*dir,
struct dentry *hidden_dentry = NULL;
const char *childname;
unsigned int childnamelen;
-
- int nr_dentry;
+ int old_kmalloc_size;
+ int kmalloc_size;
+ int num_dentry;
int count;
-
int old_bstart;
int old_bend;
struct dentry **path = NULL;
diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index 463cf4c..e85bcf4 100644
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -36,7 +36,6 @@ static int __unionfs_d_revalidate_one(struct dentry *dentry,
int positive = 0;
int locked = 0;
int interpose_flag;
-
struct nameidata lowernd; /* TODO: be gentler to the stack */
if (nd)
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index f1060c5..8288cb9 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -251,6 +251,7 @@ int __parse_branch_mode(const char *name)
int parse_branch_mode(const char *name)
{
int perms = __parse_branch_mode(name);
+
if (perms == 0)
perms = MAY_READ | MAY_WRITE;
return perms;
@@ -267,7 +268,6 @@ static int parse_dirs_option(struct super_block *sb, struct
unionfs_dentry_info
int bindex = 0;
int i = 0;
int j = 0;
-
struct dentry *dent1;
struct dentry *dent2;
@@ -538,7 +538,6 @@ static int unionfs_read_super(struct super_block *sb, void
*raw_data,
int silent)
{
int err = 0;
-
struct unionfs_dentry_info *hidden_root_info = NULL;
struct odf_sb_info *odf;
int bindex, bstart, bend;
@@ -776,6 +775,7 @@ static struct file_system_type unionfs_fs_type = {
static int __init init_unionfs_fs(void)
{
int err;
+
printk("Registering unionfs " UNIONFS_VERSION "\n");
if ((err = unionfs_init_filldir_cache()))
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 1a508ce..5ee3d70 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -214,6 +214,7 @@ static noinline int do_remount_del_option(char *optarg, int
cur_branches,
int err = -EINVAL;
int idx;
struct nameidata nd;
+
/* optarg contains the branch name to delete */
/*
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 8b9fd76..663d646 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -251,6 +251,7 @@ struct unionfs_data *alloc_new_data(int objs);
static inline off_t rdstate2offset(struct unionfs_dir_state *buf)
{
off_t tmp;
+
tmp = ((buf->cookie & MAXRDCOOKIE) << RDOFFBITS)
| (buf->offset & DIREOF);
return tmp;
@@ -396,6 +397,7 @@ static inline int set_branchperms(struct super_block *sb,
int index, int perms)
static inline int is_robranch_super(const struct super_block *sb, int index)
{
int ret;
+
unionfs_read_lock(sb);
ret = (!(branchperms(sb, index) & MAY_WRITE)) ? -EROFS : 0;
unionfs_read_unlock(sb);
@@ -473,6 +475,7 @@ static inline struct vfsmount *unionfs_mntget(struct dentry
*dentry,
int bindex)
{
struct vfsmount *mnt;
+
if (!dentry) {
if (bindex < 0)
return NULL;
@@ -491,6 +494,7 @@ static inline struct vfsmount *unionfs_mntget(struct dentry
*dentry,
static inline void unionfs_mntput(struct dentry *dentry, int bindex)
{
struct vfsmount *mnt;
+
if (!dentry) {
if (bindex < 0)
return;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
