From f1ba358bb90c41b2c54b65ecb30f177b1694bf51 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 15 Apr 2008 19:52:03 -0400 Subject: [PATCH] Unionfs: minor code cleanups Signed-off-by: Erez Zadok --- fs/unionfs/commonfops.c | 2 -- fs/unionfs/inode.c | 39 +++++++++++++++++---------------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c index 50f4eda1ab6..0fc79633af1 100644 --- a/fs/unionfs/commonfops.c +++ b/fs/unionfs/commonfops.c @@ -250,7 +250,6 @@ static int do_delayed_copyup(struct file *file) BUG_ON(!S_ISREG(dentry->d_inode->i_mode)); unionfs_check_file(file); - unionfs_check_dentry(dentry); for (bindex = bstart - 1; bindex >= 0; bindex--) { if (!d_deleted(dentry)) err = copyup_file(parent_inode, file, bstart, @@ -292,7 +291,6 @@ static int do_delayed_copyup(struct file *file) out: unionfs_check_file(file); - unionfs_check_dentry(dentry); return err; } diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c index 64ff508a736..c490303a6d3 100644 --- a/fs/unionfs/inode.c +++ b/fs/unionfs/inode.c @@ -388,28 +388,23 @@ docopyup: bindex, old_dentry->d_name.name, old_dentry->d_name.len, NULL, i_size_read(old_dentry->d_inode)); - if (!err) { - lower_new_dentry = - create_parents(dir, new_dentry, - new_dentry->d_name.name, - bindex); - lower_old_dentry = - unionfs_lower_dentry(old_dentry); - lower_dir_dentry = - lock_parent(lower_new_dentry); - /* - * see - * Documentation/filesystems/unionfs/issues.txt - */ - lockdep_off(); - /* do vfs_link */ - err = vfs_link(lower_old_dentry, - lower_dir_dentry->d_inode, - lower_new_dentry); - lockdep_on(); - unlock_dir(lower_dir_dentry); - goto check_link; - } + if (err) + continue; + lower_new_dentry = + create_parents(dir, new_dentry, + new_dentry->d_name.name, + bindex); + lower_old_dentry = unionfs_lower_dentry(old_dentry); + lower_dir_dentry = lock_parent(lower_new_dentry); + /* see Documentation/filesystems/unionfs/issues.txt */ + lockdep_off(); + /* do vfs_link */ + err = vfs_link(lower_old_dentry, + lower_dir_dentry->d_inode, + lower_new_dentry); + lockdep_on(); + unlock_dir(lower_dir_dentry); + goto check_link; } goto out; } -- 2.43.0