fs: add get_acl helper

Factor out the code to get an ACL either from the inode or disk from
check_acl, so that it can be used elsewhere later on.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 3 insertions, 21 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 3531deebad30..bcb838e2e52f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -235,27 +235,9 @@ static int check_acl(struct inode *inode, int mask)
                 return posix_acl_permission(inode, acl, mask & ~MAY_NOT_BLOCK);
         }
 
-        acl = get_cached_acl(inode, ACL_TYPE_ACCESS);
-
-        /*
-         * A filesystem can force a ACL callback by just never filling the
-         * ACL cache. But normally you'd fill the cache either at inode
-         * instantiation time, or on the first ->get_acl call.
-         *
-         * If the filesystem doesn't have a get_acl() function at all, we'll
-         * just create the negative cache entry.
-         */
-        if (acl == ACL_NOT_CACHED) {
-                if (inode->i_op->get_acl) {
-                        acl = inode->i_op->get_acl(inode, ACL_TYPE_ACCESS);
-                        if (IS_ERR(acl))
-                                return PTR_ERR(acl);
-                } else {
-                        set_cached_acl(inode, ACL_TYPE_ACCESS, NULL);
-                        return -EAGAIN;
-                }
-        }
-
+        acl = get_acl(inode, ACL_TYPE_ACCESS);
+        if (IS_ERR(acl))
+                return PTR_ERR(acl);
         if (acl) {
                 int error = posix_acl_permission(inode, acl, mask);
                 posix_acl_release(acl);