diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-11-14 09:34:01 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-14 09:34:01 +1100 |
| commit | 185c0f26c0267d5978b5c30d3a04f90cb245cd76 (patch) | |
| tree | 4b1324c9445bbcff095fb3ce755ec46d315bda5a /fs/overlayfs/inode.c | |
| parent | eafb7b9d01a7001ff8e9624e7dcb706844f981b3 (diff) | |
| parent | a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff) | |
Merge commit 'v4.9-rc5' into next
Diffstat (limited to 'fs/overlayfs/inode.c')
| -rw-r--r-- | fs/overlayfs/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index c58f01babf30..7fb53d055537 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -270,9 +270,6 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type) if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode)) return NULL; - if (!realinode->i_op->get_acl) - return NULL; - old_cred = ovl_override_creds(inode->i_sb); acl = get_acl(realinode, type); revert_creds(old_cred); |