From 8d5dc2cf06e92100d569854d36361fc93204fb67 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 28 Oct 2020 09:26:51 -0700 Subject: [PATCH] ANDROID: overlayfs: fixup after upstream merge Resolve merge conflicts from 5.10-rc1 Signed-off-by: Mark Salyzyn Bug: 171874122 Change-Id: I87bbb2f2fd6a9b3c019046a6179245fc45f57eda --- fs/overlayfs/overlayfs.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 636631619265..da4a25ac9b01 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -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);