nfsd: use get_acl and ->set_acl

[cascardo/linux.git] / fs / nfsd / nfs2acl.c

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 95d76dc..11c1fba 100644 (file)
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -30,8 +30,9 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)
 static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
                struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)
 {
-       svc_fh *fh;
        struct posix_acl *acl;
+       struct inode *inode;
+       svc_fh *fh;
        __be32 nfserr = 0;
 
        dprintk("nfsd: GETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
@@ -41,6 +42,8 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
        if (nfserr)
                RETURN_STATUS(nfserr);
 
+       inode = fh->fh_dentry->d_inode;
+
        if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
                RETURN_STATUS(nfserr_inval);
        resp->mask = argp->mask;
@@ -50,21 +53,13 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
                goto fail;
 
        if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {
-               acl = nfsd_get_posix_acl(fh, ACL_TYPE_ACCESS);
+               acl = get_acl(inode, ACL_TYPE_ACCESS);
                if (IS_ERR(acl)) {
-                       int err = PTR_ERR(acl);
-
-                       if (err == -ENODATA || err == -EOPNOTSUPP)
-                               acl = NULL;
-                       else {
-                               nfserr = nfserrno(err);
-                               goto fail;
-                       }
+                       nfserr = nfserrno(PTR_ERR(acl));
+                       goto fail;
                }
                if (acl == NULL) {
                        /* Solaris returns the inode's minimum ACL. */
-
-                       struct inode *inode = fh->fh_dentry->d_inode;
                        acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
                }
                resp->acl_access = acl;
@@ -72,17 +67,10 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
        if (resp->mask & (NFS_DFACL|NFS_DFACLCNT)) {
                /* Check how Solaris handles requests for the Default ACL
                   of a non-directory! */
-
-               acl = nfsd_get_posix_acl(fh, ACL_TYPE_DEFAULT);
+               acl = get_acl(inode, ACL_TYPE_DEFAULT);
                if (IS_ERR(acl)) {
-                       int err = PTR_ERR(acl);
-
-                       if (err == -ENODATA || err == -EOPNOTSUPP)
-                               acl = NULL;
-                       else {
-                               nfserr = nfserrno(err);
-                               goto fail;
-                       }
+                       nfserr = nfserrno(PTR_ERR(acl));
+                       goto fail;
                }
                resp->acl_default = acl;
        }
@@ -103,31 +91,51 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,
                struct nfsd3_setaclargs *argp,
                struct nfsd_attrstat *resp)
 {
+       struct inode *inode;
        svc_fh *fh;
        __be32 nfserr = 0;
+       int error;
 
        dprintk("nfsd: SETACL(2acl)   %s\n", SVCFH_fmt(&argp->fh));
 
        fh = fh_copy(&resp->fh, &argp->fh);
        nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR);
+       if (nfserr)
+               goto out;
 
-       if (!nfserr) {
-               nfserr = nfserrno( nfsd_set_posix_acl(
-                       fh, ACL_TYPE_ACCESS, argp->acl_access) );
-       }
-       if (!nfserr) {
-               nfserr = nfserrno( nfsd_set_posix_acl(
-                       fh, ACL_TYPE_DEFAULT, argp->acl_default) );
-       }
-       if (!nfserr) {
-               nfserr = fh_getattr(fh, &resp->stat);
+       inode = fh->fh_dentry->d_inode;
+       if (!IS_POSIXACL(inode) || !inode->i_op->set_acl) {
+               error = -EOPNOTSUPP;
+               goto out_errno;
        }
 
+       error = fh_want_write(fh);
+       if (error)
+               goto out_errno;
+
+       error = inode->i_op->set_acl(inode, argp->acl_access, ACL_TYPE_ACCESS);
+       if (error)
+               goto out_drop_write;
+       error = inode->i_op->set_acl(inode, argp->acl_default,
+                                    ACL_TYPE_DEFAULT);
+       if (error)
+               goto out_drop_write;
+
+       fh_drop_write(fh);
+
+       nfserr = fh_getattr(fh, &resp->stat);
+
+out:
        /* argp->acl_{access,default} may have been allocated in
           nfssvc_decode_setaclargs. */
        posix_acl_release(argp->acl_access);
        posix_acl_release(argp->acl_default);
        return nfserr;
+out_drop_write:
+       fh_drop_write(fh);
+out_errno:
+       nfserr = nfserrno(error);
+       goto out;
 }
 
 /*