diff options
| author | lucasponez <lucasponez@outlook.com> | 2020-05-10 12:06:32 +0200 |
|---|---|---|
| committer | lucasponez <lucasponez@outlook.com> | 2020-12-08 00:57:06 -0800 |
| commit | 5f257afbf54049e67cf36eaf8ba6605c613c6276 (patch) | |
| tree | 4475378efea58aa13974911cbdfc8d179c42d3b0 | |
| parent | b9ebceb39505bd5540e01d088375ca8c16ef36c0 (diff) | |
Revert "Revert "ANDROID: xattr: Pass EOPNOTSUPP to permission2""
This reverts commit 7a83b561dc5a4b895a298dc8c575a9873753f7bd.
| -rw-r--r-- | fs/sdcardfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/xattr.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/sdcardfs/inode.c b/fs/sdcardfs/inode.c index 72a13a84f1e5..2d6c8bba71e6 100644 --- a/fs/sdcardfs/inode.c +++ b/fs/sdcardfs/inode.c @@ -632,6 +632,8 @@ static int sdcardfs_permission(struct vfsmount *mnt, struct inode *inode, int ma uid_t cred_userid; uid_t inode_userid; #endif + if (IS_ERR(mnt)) + return PTR_ERR(mnt); if (!top) return -EINVAL; diff --git a/fs/xattr.c b/fs/xattr.c index cfc6324cfd6e..af900eae01d7 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -70,7 +70,7 @@ xattr_permission(struct inode *inode, const char *name, int mask) return -EPERM; } - return inode_permission(inode, mask); + return inode_permission2(ERR_PTR(-EOPNOTSUPP), inode, mask); } /** |