projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e35c4d
)
ubifs: switch to fscrypt_prepare_link()
author
Eric Biggers
<ebiggers@google.com>
Wed, 29 Nov 2017 20:43:14 +0000
(12:43 -0800)
committer
Richard Weinberger
<richard@nod.at>
Wed, 17 Jan 2018 20:48:03 +0000
(21:48 +0100)
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
fs/ubifs/dir.c
patch
|
blob
|
history
diff --git
a/fs/ubifs/dir.c
b/fs/ubifs/dir.c
index 417fe0b29f23e9068d623a4e5fc582835373199c..09e6c56b11bcef19bd66f14402c4db9a74342c9e 100644
(file)
--- a/
fs/ubifs/dir.c
+++ b/
fs/ubifs/dir.c
@@
-743,9
+743,9
@@
static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
ubifs_assert(inode_is_locked(dir));
ubifs_assert(inode_is_locked(inode));
- if (ubifs_crypt_is_encrypted(dir) &&
-
!fscrypt_has_permitted_context(dir, inode)
)
- return
-EPERM
;
+ err = fscrypt_prepare_link(old_dentry, dir, dentry);
+
if (err
)
+ return
err
;
err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm);
if (err)