mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: overlayfs: fixup after upstream merge

Browse Source 
Resolve merge conflicts from 5.10-rc1

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 171874122
Change-Id: I87bbb2f2fd6a9b3c019046a6179245fc45f57eda
This commit is contained in:
Mark Salyzyn
2020-10-28 09:26:51 -07:00
parent 077f295902
commit 8d5dc2cf06
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/overlayfs/overlayfs.h
View File

@@ -184,7 +184,9 @@ static inline ssize_t ovl_do_getxattr(struct ovl_fs *ofs, struct dentry *dentry,
size_t size)
{
const char *name = ovl_xattr(ofs, ox);
return vfs_getxattr(dentry, name, value, size);
struct inode *ip = d_inode(dentry);
return __vfs_getxattr(dentry, ip, name, value, size, XATTR_NOSECURITY);
}
static inline int ovl_do_setxattr(struct ovl_fs *ofs, struct dentry *dentry,
@@ -246,14 +248,6 @@ static inline bool ovl_open_flags_need_copy_up(int flags)
return ((OPEN_FMODE(flags) & FMODE_WRITE) || (flags & O_TRUNC));
}
static inline ssize_t ovl_do_vfs_getxattr(struct dentry *dentry,
const char *name, void *buf,
size_t size)
{
return __vfs_getxattr(dentry, d_inode(dentry), name, buf, size,
XATTR_NOSECURITY);
}
/* util.c */
int ovl_want_write(struct dentry *dentry);
void ovl_drop_write(struct dentry *dentry);