VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2012-10-02 21:38:48 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-10-02 21:38:48 -0700 commit: 88265322c14cce39f7afbc416726ef4fac413298 parent: 65b99c74fdd325d1ffa2e5663295888704712604

Commit Summary:

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Diffstat:

1 file changed, 4 insertions, 2 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index ca15fbd391c8..1780f062dbaf 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -296,11 +296,13 @@ vfs_removexattr(struct dentry *dentry, const char *name)
 	if (error)
 		return error;
 
+	mutex_lock(&inode->i_mutex);
 	error = security_inode_removexattr(dentry, name);
-	if (error)
+	if (error) {
+		mutex_unlock(&inode->i_mutex);
 		return error;
+	}
 
-	mutex_lock(&inode->i_mutex);
 	error = inode->i_op->removexattr(dentry, name);
 	mutex_unlock(&inode->i_mutex);