As "locked" tracks the mutex lock state of "new" dentry inode instead of "old" dentry inode, name the variable "new_locked" instead. Soon I will need to lock old dentry inode lock as well and will track that state in variable "locked". Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx> --- fs/overlayfs/dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index 839709c7803a..8a38f3136547 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -892,7 +892,7 @@ static int ovl_rename(struct inode *olddir, struct dentry *old, unsigned int flags) { int err; - bool locked = false; + bool new_locked = false; struct dentry *old_upperdir; struct dentry *new_upperdir; struct dentry *olddentry; @@ -959,7 +959,7 @@ static int ovl_rename(struct inode *olddir, struct dentry *old, if (err) goto out_drop_write; } else { - err = ovl_nlink_start(new, &locked); + err = ovl_nlink_start(new, &new_locked); if (err) goto out_drop_write; } @@ -1087,7 +1087,7 @@ static int ovl_rename(struct inode *olddir, struct dentry *old, unlock_rename(new_upperdir, old_upperdir); out_revert_creds: revert_creds(old_cred); - ovl_nlink_end(new, locked); + ovl_nlink_end(new, new_locked); out_drop_write: ovl_drop_write(old); out: -- 2.13.6 -- To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html