summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-01 07:57:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-01 07:57:27 -0400
commitf97b870eced0ec562f953d32eda03906c7dacad6 (patch)
tree232ce6b9dc47eecd3f69cf64b0018431397009cc /fs
parent9522f476d932eb23ebf8dbbc6b4e2f966f3fe911 (diff)
parent7c7feb2ebfc9c0552c51f0c050db1d1a004faac5 (diff)
downloadlinux-f97b870eced0ec562f953d32eda03906c7dacad6.tar.bz2
Merge tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS fixes from Richard Weinberger: "This contains three bug fixes for both UBI and UBIFS" * tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs: UBI: return ENOSPC if no enough space available UBI: Validate data_size UBIFS: Kill unneeded locking in ubifs_init_security
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/xattr.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 96f3448b6eb4..fd65b3f1923c 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -652,11 +652,8 @@ int ubifs_init_security(struct inode *dentry, struct inode *inode,
{
int err;
- mutex_lock(&inode->i_mutex);
err = security_inode_init_security(inode, dentry, qstr,
&init_xattrs, 0);
- mutex_unlock(&inode->i_mutex);
-
if (err) {
struct ubifs_info *c = dentry->i_sb->s_fs_info;
ubifs_err(c, "cannot initialize security for inode %lu, error %d",