projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
cachefiles
/
namei.c
diff --git
a/fs/cachefiles/namei.c
b/fs/cachefiles/namei.c
index
c6ee4b5
..
339c910
100644
(file)
--- a/
fs/cachefiles/namei.c
+++ b/
fs/cachefiles/namei.c
@@
-20,6
+20,7
@@
#include <linux/namei.h>
#include <linux/security.h>
#include <linux/slab.h>
#include <linux/namei.h>
#include <linux/security.h>
#include <linux/slab.h>
+#include <linux/xattr.h>
#include "internal.h"
#define CACHEFILES_KEYBUF_SIZE 512
#include "internal.h"
#define CACHEFILES_KEYBUF_SIZE 512
@@
-799,8
+800,7
@@
struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache,
}
ret = -EPERM;
}
ret = -EPERM;
- if (!d_backing_inode(subdir)->i_op->setxattr ||
- !d_backing_inode(subdir)->i_op->getxattr ||
+ if (!(d_backing_inode(subdir)->i_opflags & IOP_XATTR) ||
!d_backing_inode(subdir)->i_op->lookup ||
!d_backing_inode(subdir)->i_op->mkdir ||
!d_backing_inode(subdir)->i_op->create ||
!d_backing_inode(subdir)->i_op->lookup ||
!d_backing_inode(subdir)->i_op->mkdir ||
!d_backing_inode(subdir)->i_op->create ||