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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[firefly-linux-kernel-4.4.55.git]
/
fs
/
cachefiles
/
namei.c
diff --git
a/fs/cachefiles/namei.c
b/fs/cachefiles/namei.c
index 6494d9f673aa51490a59694d600bd8a7101559bf..c0a681705104fc7a8aae428169e3f342bb4cb8a4 100644
(file)
--- a/
fs/cachefiles/namei.c
+++ b/
fs/cachefiles/namei.c
@@
-779,8
+779,7
@@
struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
}
ret = -EPERM;
- if (!subdir->d_inode->i_op ||
- !subdir->d_inode->i_op->setxattr ||
+ if (!subdir->d_inode->i_op->setxattr ||
!subdir->d_inode->i_op->getxattr ||
!subdir->d_inode->i_op->lookup ||
!subdir->d_inode->i_op->mkdir ||