projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ecryptfs
/
inode.c
diff --git
a/fs/ecryptfs/inode.c
b/fs/ecryptfs/inode.c
index e62f3fc7241edcb9f03ce1e87812e3c9fe0b9bd6..1548be26b5e61060ee5c5eb440209bd98b850724 100644
(file)
--- a/
fs/ecryptfs/inode.c
+++ b/
fs/ecryptfs/inode.c
@@
-38,7
+38,7
@@
static struct dentry *lock_parent(struct dentry *dentry)
struct dentry *dir;
dir = dget(dentry->d_parent);
- mutex_lock
(&(dir->d_inode->i_mutex)
);
+ mutex_lock
_nested(&(dir->d_inode->i_mutex), I_MUTEX_PARENT
);
return dir;
}