GIT: unionfs2-2.6.27.y: Unionfs: remove unnecessary lock when deleting whiteouts

Erez Zadok ezk at fsl.cs.sunysb.edu
Thu Aug 12 23:17:37 EDT 2010


commit 8aa1bc8a223822cbc3e33eed5d11db2b9ed4c3bd
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Dec 20 23:10:19 2007 -0500

    Unionfs: remove unnecessary lock when deleting whiteouts
    
    Lockdep complained, because we eventually call vfs_unlink which'd grab the
    necessary locks.
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index 2e52fc3..b40090a 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -110,7 +110,6 @@ int delete_whiteouts(struct dentry *dentry, int bindex,
 	lower_dir = lower_dir_dentry->d_inode;
 	BUG_ON(!S_ISDIR(lower_dir->i_mode));
 
-	mutex_lock(&lower_dir->i_mutex);
 	if (!permission(lower_dir, MAY_WRITE | MAY_EXEC, NULL)) {
 		err = do_delete_whiteouts(dentry, bindex, namelist);
 	} else {
@@ -120,7 +119,6 @@ int delete_whiteouts(struct dentry *dentry, int bindex,
 		run_sioq(__delete_whiteouts, &args);
 		err = args.err;
 	}
-	mutex_unlock(&lower_dir->i_mutex);
 
 out:
 	return err;


More information about the unionfs-cvs mailing list