diff options
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c index 9f4f5fecc096..f0c4ace408e4 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -1732,11 +1732,9 @@ EXPORT_SYMBOL(inode_init_owner); | |||
1732 | */ | 1732 | */ |
1733 | bool inode_owner_or_capable(const struct inode *inode) | 1733 | bool inode_owner_or_capable(const struct inode *inode) |
1734 | { | 1734 | { |
1735 | struct user_namespace *ns = inode_userns(inode); | 1735 | if (current_fsuid() == inode->i_uid) |
1736 | |||
1737 | if (current_user_ns() == ns && current_fsuid() == inode->i_uid) | ||
1738 | return true; | 1736 | return true; |
1739 | if (ns_capable(ns, CAP_FOWNER)) | 1737 | if (inode_capable(inode, CAP_FOWNER)) |
1740 | return true; | 1738 | return true; |
1741 | return false; | 1739 | return false; |
1742 | } | 1740 | } |