fs: rename current get acl method

[linux-2.6-block.git] / fs / nfsd / nfs4acl.c

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index bb8e2f6d7d03c4b9b8f8abeeae7d6e6019c6fadf..518203821790cd38ddf5fc16c93fb959b80ac275 100644 (file)
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -135,7 +135,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
        unsigned int flags = 0;
        int size = 0;
 
-       pacl = get_acl(inode, ACL_TYPE_ACCESS);
+       pacl = get_inode_acl(inode, ACL_TYPE_ACCESS);
        if (!pacl)
                pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
 
@@ -147,7 +147,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
 
        if (S_ISDIR(inode->i_mode)) {
                flags = NFS4_ACL_DIR;
-               dpacl = get_acl(inode, ACL_TYPE_DEFAULT);
+               dpacl = get_inode_acl(inode, ACL_TYPE_DEFAULT);
                if (IS_ERR(dpacl)) {
                        error = PTR_ERR(dpacl);
                        goto rel_pacl;