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
/
overlayfs
/
super.c
diff --git
a/fs/overlayfs/super.c
b/fs/overlayfs/super.c
index
e2a94a2
..
7e3f012
100644
(file)
--- a/
fs/overlayfs/super.c
+++ b/
fs/overlayfs/super.c
@@
-275,10
+275,10
@@
static bool ovl_is_opaquedir(struct dentry *dentry)
char val;
struct inode *inode = dentry->d_inode;
char val;
struct inode *inode = dentry->d_inode;
- if (!S_ISDIR(inode->i_mode) || !
inode->i_op->getxattr
)
+ if (!S_ISDIR(inode->i_mode) || !
(inode->i_opflags & IOP_XATTR)
)
return false;
return false;
- res =
inode->i_op->
getxattr(dentry, inode, OVL_XATTR_OPAQUE, &val, 1);
+ res =
__vfs_
getxattr(dentry, inode, OVL_XATTR_OPAQUE, &val, 1);
if (res == 1 && val == 'y')
return true;
if (res == 1 && val == 'y')
return true;
@@
-1320,7
+1320,7
@@
static int ovl_fill_super(struct super_block *sb, void *data, int silent)
sb->s_xattr = ovl_xattr_handlers;
sb->s_root = root_dentry;
sb->s_fs_info = ufs;
sb->s_xattr = ovl_xattr_handlers;
sb->s_root = root_dentry;
sb->s_fs_info = ufs;
- sb->s_flags |= MS_POSIXACL;
+ sb->s_flags |= MS_POSIXACL
| MS_NOREMOTELOCK
;
return 0;
return 0;