0/2 Unionfs updates/fixes/cleanups
The following is a series of patches related to Unionfs: just a couple of small bug fixes and/or optimizations.
These patches were tested (where appropriate) on Linus's 2.6.24 latest code (as of v2.6.24-rc4-124-gf194d13), MM, as well as the backports to 2.6.{23,22,21,20,19,18,9} on ext2/3/4, xfs, reiserfs, nfs2/3/4, jffs2, ramfs, tmpfs, cramfs, and squashfs (where available). See
http://unionfs.filesystems.org/ to download back-ported unionfs code.
Please pull from the 'master' branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/ezk/unionfs.git
to receive the following:
Erez Zadok (2):
Unionfs: cleanup/consolidate branch-mode parsing code
Unionfs: reduce the amount of cache-coherency debugging messages
dentry.c | 38 +++++++++++++++++++++++--------------- main.c | 44 ++++++++++++++++++++++---------------------- super.c | 12 ++++++++---- union.h | 3 +-- 4 files changed, 54 insertions(+), 43 deletions(-)
---
Erez Zadok
[email protected]
PATCH 1/2 Unionfs: cleanup/consolidate branch-mode parsing code
Also a bug fix: disallow unrecognized branch modes at mount time, instead of defaulting to "rw".
--- fs/unionfs/main.c | 44 ++++++++++++++++++++++---------------------- fs/unionfs/super.c | 12 ++++++++---- fs/unionfs/union.h | 3 +-- 3 files changed, 31 insertions(+), 28 deletions(-)
fs/unionfs/main.c +22 -22
@@ -256,30 +256,21 @@ static int is_branch_overlap(struct dentry *dent1, struct dentry *dent2) }/* -* Parse branch mode helper function +* Parse "ro" or "rw" options, but default to "rw" if no mode options was +* specified. Fill the mode bits in @perms. If encounter an unknown +* string, return -EINVAL. Otherwise return 0. */ -int __parse_branch_mode (const char *name) +int parse_branch_mode (const char *name,int *perms) { -if (!name) +if (!name || !strcmp (name,"rw" )) { + *perms =MAY_READ |MAY_WRITE ;return 0 ; -if (!strcmp (name,"ro" )) -return MAY_READ ; -if (!strcmp (name,"rw" )) -return (MAY_READ |MAY_WRITE ); -return 0 ; -} - -/* -* Parse "ro" or "rw" options, but default to "rw" of no mode options -* was specified. -*/ -int parse_branch_mode (const char *name) -{ -int perms =__parse_branch_mode (name); - -if (perms ==0 ) - perms =MAY_READ |MAY_WRITE ; -return perms; + } +if (!strcmp (name,"ro" )) { + *perms =MAY_READ ; +return 0 ; + } +return -EINVAL ; }/*
@@ -350,8 +341,17 @@ static int parse_dirs_option(struct super_block *sb, struct unionfs_dentry_infoif (mode) *mode++ ='\0' ; - perms =parse_branch_mode (mode); + err =parse_branch_mode (mode, &perms); +if (err) { +printk (KERN_ERR "unionfs: invalid mode \"%s\" for " +"branch %d\n" , mode, bindex); + goto out; + } +/* ensure that leftmost branch is writeable */ if (!bindex && !(perms &MAY_WRITE )) { +printk (KERN_ERR "unionfs: leftmost branch cannot be " +"read-only (use \"-o ro\" to create a " +"read-only union)\n" ); err = -EINVAL ; goto out; }
fs/unionfs/super.c +8 -4
@@ -181,8 +181,8 @@ static noinline int do_remount_mode_option(char *optarg, int cur_branches, goto out; } *modename++ ='\0' ; - perms =__parse_branch_mode (modename); -if (perms ==0 ) { + err =parse_branch_mode (modename, &perms); +if (err) {printk (KERN_ERR "unionfs: invalid mode \"%s\" for \"%s\"\n" , modename, optarg); goto out;
@@ -350,13 +350,17 @@ found_insertion_point: modename =strchr (new_branch,'=' );if (modename) *modename++ ='\0' ; - perms =parse_branch_mode (modename); -if (!new_branch || !*new_branch) {printk (KERN_ERR "unionfs: null new branch\n" ); err = -EINVAL ; goto out; } + err =parse_branch_mode (modename, &perms); +if (err) { +printk (KERN_ERR "unionfs: invalid mode \"%s\" for " +"branch \"%s\"\n" , modename, new_branch); + goto out; + } err =path_lookup (new_branch,LOOKUP_FOLLOW , &nd);if (err) { printk(KERN_ERR "unionfs: error accessing "
fs/unionfs/union.h +1 -2
@@ -474,8 +474,7 @@ static inline int is_robranch(const struct dentry *dentry)*/ extern char *alloc_whname (const char *name,int len);extern int check_branch (struct nameidata *nd); -extern int __parse_branch_mode (const char *name); -extern int parse_branch_mode (const char *name); +extern int parse_branch_mode (const char *name,int *perms);/* * These two functions are here because it is kind of daft to copy and paste
Signature · 1 line
1.5.2.2
PATCH 2/2 Unionfs: reduce the amount of cache-coherency debugging messages
In reply to Erez Zadok--- fs/unionfs/dentry.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-)
fs/unionfs/dentry.c +23 -15
@@ -195,9 +195,11 @@ out:* file system doesn't change its inode times quick enough, resulting in a * false positive indication (which is harmless, it just makes unionfs do * extra work in re-validating the objects). To minimize the chances of -* these situations, we delay the detection of changed times by -* UNIONFS_MIN_CC_TIME (which defaults to 3 seconds, as with NFS's -* acregmin). +* these situations, we still consider such small time changes valid, but we +* don't print debugging messages unless the time changes are greater than +* UNIONFS_MIN_CC_TIME (which defaults to 3 seconds, as with NFS's acregmin) +* because significant changes are more likely due to users manually +* touching lower files. */ bool is_newer_lower (const struct dentry *dentry) {
@@ -219,20 +221,26 @@ bool is_newer_lower(const struct dentry *dentry)continue ;/* check if mtime/ctime have changed */ -if (unlikely ((lower_inode->i_mtime.tv_sec - - inode->i_mtime.tv_sec) >UNIONFS_MIN_CC_TIME )) { -pr_info ("unionfs: new lower inode mtime " -"(bindex=%d, name=%s)\n" , bindex, - dentry->d_name.name); -show_dinode_times (dentry); +if (unlikely (timespec_compare (&inode->i_mtime, + &lower_inode->i_mtime) <0 )) { +if ((lower_inode->i_mtime.tv_sec - + inode->i_mtime.tv_sec) >UNIONFS_MIN_CC_TIME ) { +pr_info ("unionfs: new lower inode mtime " +"(bindex=%d, name=%s)\n" , bindex, + dentry->d_name.name); +show_dinode_times (dentry); + }return true; } -if (unlikely ((lower_inode->i_ctime.tv_sec - - inode->i_ctime.tv_sec) >UNIONFS_MIN_CC_TIME )) { -pr_info ("unionfs: new lower inode ctime " -"(bindex=%d, name=%s)\n" , bindex, - dentry->d_name.name); -show_dinode_times (dentry); +if (unlikely (timespec_compare (&inode->i_ctime, + &lower_inode->i_ctime) <0 )) { +if ((lower_inode->i_ctime.tv_sec - + inode->i_ctime.tv_sec) >UNIONFS_MIN_CC_TIME ) { +pr_info ("unionfs: new lower inode ctime " +"(bindex=%d, name=%s)\n" , bindex, + dentry->d_name.name); +show_dinode_times (dentry); + }return true; } }
Signature · 1 line
1.5.2.2