nfsd4: add a helper function to decide if stateid is delegation
[safe/jmp/linux-2.6] / fs / nfsd / nfs4proc.c
index 0972cb3..af66073 100644 (file)
  *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Note: some routines in this file are just trivial wrappers
- * (e.g. nfsd4_lookup()) defined solely for the sake of consistent
- * naming.  Since all such routines have been declared "inline",
- * there shouldn't be any associated overhead.  At some point in
- * the future, I might inline these "by hand" to clean up a
- * little.
  */
 
 #include <linux/param.h>
@@ -54,6 +47,7 @@
 #include <linux/nfsd/state.h>
 #include <linux/nfsd/xdr4.h>
 #include <linux/nfs4_acl.h>
+#include <linux/sunrpc/gss_api.h>
 
 #define NFSDDBG_FACILITY               NFSDDBG_PROC
 
@@ -77,11 +71,11 @@ do_open_permission(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs
                return nfserr_inval;
 
        if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
-               accmode |= MAY_READ;
+               accmode |= NFSD_MAY_READ;
        if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
-               accmode |= (MAY_WRITE | MAY_TRUNC);
+               accmode |= (NFSD_MAY_WRITE | NFSD_MAY_TRUNC);
        if (open->op_share_deny & NFS4_SHARE_DENY_WRITE)
-               accmode |= MAY_WRITE;
+               accmode |= NFSD_MAY_WRITE;
 
        status = fh_verify(rqstp, current_fh, S_IFREG, accmode);
 
@@ -106,7 +100,17 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
                status = nfsd_create_v3(rqstp, current_fh, open->op_fname.data,
                                        open->op_fname.len, &open->op_iattr,
                                        &resfh, open->op_createmode,
-                                       (u32 *)open->op_verf.data, &open->op_truncate, &created);
+                                       (u32 *)open->op_verf.data,
+                                       &open->op_truncate, &created);
+
+               /*
+                * Following rfc 3530 14.2.16, use the returned bitmask
+                * to indicate which attributes we used to store the
+                * verifier:
+                */
+               if (open->op_createmode == NFS4_CREATE_EXCLUSIVE && status == 0)
+                       open->op_bmval[1] = (FATTR4_WORD1_TIME_ACCESS |
+                                               FATTR4_WORD1_TIME_MODIFY);
        } else {
                status = nfsd_lookup(rqstp, current_fh,
                                     open->op_fname.data, open->op_fname.len, &resfh);
@@ -116,15 +120,14 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
                goto out;
 
        set_change_info(&open->op_cinfo, current_fh);
-
-       /* set reply cache */
        fh_dup2(current_fh, &resfh);
-       open->op_stateowner->so_replay.rp_openfh_len = resfh.fh_handle.fh_size;
-       memcpy(open->op_stateowner->so_replay.rp_openfh,
-                       &resfh.fh_handle.fh_base, resfh.fh_handle.fh_size);
 
+       /* set reply cache */
+       fh_copy_shallow(&open->op_stateowner->so_replay.rp_openfh,
+                       &resfh.fh_handle);
        if (!created)
-               status = do_open_permission(rqstp, current_fh, open, MAY_NOP);
+               status = do_open_permission(rqstp, current_fh, open,
+                                           NFSD_MAY_NOP);
 
 out:
        fh_put(&resfh);
@@ -147,21 +150,20 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_
        memset(&open->op_cinfo, 0, sizeof(struct nfsd4_change_info));
 
        /* set replay cache */
-       open->op_stateowner->so_replay.rp_openfh_len = current_fh->fh_handle.fh_size;
-       memcpy(open->op_stateowner->so_replay.rp_openfh,
-               &current_fh->fh_handle.fh_base,
-               current_fh->fh_handle.fh_size);
+       fh_copy_shallow(&open->op_stateowner->so_replay.rp_openfh,
+                       &current_fh->fh_handle);
 
        open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) &&
                (open->op_iattr.ia_size == 0);
 
-       status = do_open_permission(rqstp, current_fh, open, MAY_OWNER_OVERRIDE);
+       status = do_open_permission(rqstp, current_fh, open,
+                                   NFSD_MAY_OWNER_OVERRIDE);
 
        return status;
 }
 
 
-static inline __be32
+static __be32
 nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
           struct nfsd4_open *open)
 {
@@ -181,10 +183,9 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        if (status == nfserr_replay_me) {
                struct nfs4_replay *rp = &open->op_stateowner->so_replay;
                fh_put(&cstate->current_fh);
-               cstate->current_fh.fh_handle.fh_size = rp->rp_openfh_len;
-               memcpy(&cstate->current_fh.fh_handle.fh_base, rp->rp_openfh,
-                               rp->rp_openfh_len);
-               status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
+               fh_copy_shallow(&cstate->current_fh.fh_handle,
+                               &rp->rp_openfh);
+               status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
                if (status)
                        dprintk("nfsd4_open: replay failed"
                                " restoring previous filehandle\n");
@@ -197,10 +198,10 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        /* Openowner is now set, so sequence id will get bumped.  Now we need
         * these checks before we do any creates: */
        status = nfserr_grace;
-       if (nfs4_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)
+       if (locks_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)
                goto out;
        status = nfserr_no_grace;
-       if (!nfs4_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
+       if (!locks_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
                goto out;
 
        switch (open->op_claim_type) {
@@ -236,12 +237,12 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                        break;
                case NFS4_OPEN_CLAIM_DELEGATE_PREV:
                        open->op_stateowner->so_confirmed = 1;
-                       printk("NFSD: unsupported OPEN claim type %d\n",
+                       dprintk("NFSD: unsupported OPEN claim type %d\n",
                                open->op_claim_type);
                        status = nfserr_notsupp;
                        goto out;
                default:
-                       printk("NFSD: Invalid OPEN claim type %d\n",
+                       dprintk("NFSD: Invalid OPEN claim type %d\n",
                                open->op_claim_type);
                        status = nfserr_inval;
                        goto out;
@@ -264,8 +265,9 @@ out:
 /*
  * filehandle-manipulating ops.
  */
-static inline __be32
-nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh)
+static __be32
+nfsd4_getfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+           struct svc_fh **getfh)
 {
        if (!cstate->current_fh.fh_dentry)
                return nfserr_nofilehandle;
@@ -274,7 +276,7 @@ nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh)
        return nfs_ok;
 }
 
-static inline __be32
+static __be32
 nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
            struct nfsd4_putfh *putfh)
 {
@@ -282,22 +284,23 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        cstate->current_fh.fh_handle.fh_size = putfh->pf_fhlen;
        memcpy(&cstate->current_fh.fh_handle.fh_base, putfh->pf_fhval,
               putfh->pf_fhlen);
-       return fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
+       return fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
 }
 
-static inline __be32
-nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
+static __be32
+nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+               void *arg)
 {
        __be32 status;
 
        fh_put(&cstate->current_fh);
-       status = exp_pseudoroot(rqstp->rq_client, &cstate->current_fh,
-                             &rqstp->rq_chandle);
+       status = exp_pseudoroot(rqstp, &cstate->current_fh);
        return status;
 }
 
-static inline __be32
-nfsd4_restorefh(struct nfsd4_compound_state *cstate)
+static __be32
+nfsd4_restorefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+               void *arg)
 {
        if (!cstate->save_fh.fh_dentry)
                return nfserr_restorefh;
@@ -306,8 +309,9 @@ nfsd4_restorefh(struct nfsd4_compound_state *cstate)
        return nfs_ok;
 }
 
-static inline __be32
-nfsd4_savefh(struct nfsd4_compound_state *cstate)
+static __be32
+nfsd4_savefh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            void *arg)
 {
        if (!cstate->current_fh.fh_dentry)
                return nfserr_nofilehandle;
@@ -319,7 +323,7 @@ nfsd4_savefh(struct nfsd4_compound_state *cstate)
 /*
  * misc nfsv4 ops
  */
-static inline __be32
+static __be32
 nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
             struct nfsd4_access *access)
 {
@@ -331,7 +335,7 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                           &access->ac_supported);
 }
 
-static inline __be32
+static __be32
 nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
             struct nfsd4_commit *commit)
 {
@@ -358,7 +362,8 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
        fh_init(&resfh, NFS4_FHSIZE);
 
-       status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR, MAY_CREATE);
+       status = fh_verify(rqstp, &cstate->current_fh, S_IFDIR,
+                          NFSD_MAY_CREATE);
        if (status == nfserr_symlink)
                status = nfserr_notdir;
        if (status)
@@ -434,13 +439,13 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        return status;
 }
 
-static inline __be32
+static __be32
 nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
              struct nfsd4_getattr *getattr)
 {
        __be32 status;
 
-       status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
+       status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
        if (status)
                return status;
 
@@ -454,7 +459,7 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        return nfs_ok;
 }
 
-static inline __be32
+static __be32
 nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
           struct nfsd4_link *link)
 {
@@ -470,14 +475,15 @@ nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 }
 
 static __be32
-nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
+nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             void *arg)
 {
        struct svc_fh tmp_fh;
        __be32 ret;
 
        fh_init(&tmp_fh, NFS4_FHSIZE);
-       if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh,
-                             &rqstp->rq_chandle)) != 0)
+       ret = exp_pseudoroot(rqstp, &tmp_fh);
+       if (ret)
                return ret;
        if (tmp_fh.fh_dentry == cstate->current_fh.fh_dentry) {
                fh_put(&tmp_fh);
@@ -488,7 +494,7 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
                           "..", 2, &cstate->current_fh);
 }
 
-static inline __be32
+static __be32
 nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
             struct nfsd4_lookup *lookup)
 {
@@ -497,7 +503,7 @@ nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                           &cstate->current_fh);
 }
 
-static inline __be32
+static __be32
 nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
           struct nfsd4_read *read)
 {
@@ -527,7 +533,7 @@ out:
        return status;
 }
 
-static inline __be32
+static __be32
 nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
              struct nfsd4_readdir *readdir)
 {
@@ -551,7 +557,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        return nfs_ok;
 }
 
-static inline __be32
+static __be32
 nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
               struct nfsd4_readlink *readlink)
 {
@@ -560,13 +566,13 @@ nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        return nfs_ok;
 }
 
-static inline __be32
+static __be32
 nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
             struct nfsd4_remove *remove)
 {
        __be32 status;
 
-       if (nfs4_in_grace())
+       if (locks_in_grace())
                return nfserr_grace;
        status = nfsd_unlink(rqstp, &cstate->current_fh, 0,
                             remove->rm_name, remove->rm_namelen);
@@ -579,7 +585,7 @@ nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        return status;
 }
 
-static inline __be32
+static __be32
 nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
             struct nfsd4_rename *rename)
 {
@@ -587,7 +593,7 @@ nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
        if (!cstate->save_fh.fh_dentry)
                return status;
-       if (nfs4_in_grace() && !(cstate->save_fh.fh_export->ex_flags
+       if (locks_in_grace() && !(cstate->save_fh.fh_export->ex_flags
                                        & NFSEXP_NOSUBTREECHECK))
                return nfserr_grace;
        status = nfsd_rename(rqstp, &cstate->save_fh, rename->rn_sname,
@@ -612,7 +618,31 @@ nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        return status;
 }
 
-static inline __be32
+static __be32
+nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_secinfo *secinfo)
+{
+       struct svc_fh resfh;
+       struct svc_export *exp;
+       struct dentry *dentry;
+       __be32 err;
+
+       fh_init(&resfh, NFS4_FHSIZE);
+       err = nfsd_lookup_dentry(rqstp, &cstate->current_fh,
+                                   secinfo->si_name, secinfo->si_namelen,
+                                   &exp, &dentry);
+       if (err)
+               return err;
+       if (dentry->d_inode == NULL) {
+               exp_put(exp);
+               err = nfserr_noent;
+       } else
+               secinfo->si_exp = exp;
+       dput(dentry);
+       return err;
+}
+
+static __be32
 nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
              struct nfsd4_setattr *setattr)
 {
@@ -628,18 +658,23 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                        return status;
                }
        }
+       status = mnt_want_write(cstate->current_fh.fh_export->ex_path.mnt);
+       if (status)
+               return status;
        status = nfs_ok;
        if (setattr->sa_acl != NULL)
                status = nfsd4_set_nfs4_acl(rqstp, &cstate->current_fh,
                                            setattr->sa_acl);
        if (status)
-               return status;
+               goto out;
        status = nfsd_setattr(rqstp, &cstate->current_fh, &setattr->sa_iattr,
                                0, (time_t)0);
+out:
+       mnt_drop_write(cstate->current_fh.fh_export->ex_path.mnt);
        return status;
 }
 
-static inline __be32
+static __be32
 nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
            struct nfsd4_write *write)
 {
@@ -688,14 +723,14 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
  * to NFS_OK after the call; NVERIFY by mapping NFSERR_NOT_SAME to NFS_OK.
  */
 static __be32
-nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+_nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
             struct nfsd4_verify *verify)
 {
        __be32 *buf, *p;
        int count;
        __be32 status;
 
-       status = fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
+       status = fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);
        if (status)
                return status;
 
@@ -720,7 +755,7 @@ nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                                    cstate->current_fh.fh_export,
                                    cstate->current_fh.fh_dentry, buf,
                                    &count, verify->ve_bmval,
-                                   rqstp);
+                                   rqstp, 0);
 
        /* this means that nfsd4_encode_fattr() ran out of space */
        if (status == nfserr_resource && count == 0)
@@ -740,6 +775,26 @@ out_kfree:
        return status;
 }
 
+static __be32
+nfsd4_nverify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+             struct nfsd4_verify *verify)
+{
+       __be32 status;
+
+       status = _nfsd4_verify(rqstp, cstate, verify);
+       return status == nfserr_not_same ? nfs_ok : status;
+}
+
+static __be32
+nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+            struct nfsd4_verify *verify)
+{
+       __be32 status;
+
+       status = _nfsd4_verify(rqstp, cstate, verify);
+       return status == nfserr_same ? nfs_ok : status;
+}
+
 /*
  * NULL call.
  */
@@ -778,6 +833,23 @@ static struct nfsd4_compound_state *cstate_alloc(void)
        return cstate;
 }
 
+typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
+                             void *);
+
+struct nfsd4_operation {
+       nfsd4op_func op_func;
+       u32 op_flags;
+/* Most ops require a valid current filehandle; a few don't: */
+#define ALLOWED_WITHOUT_FH 1
+/* GETATTR and ops not listed as returning NFS4ERR_MOVED: */
+#define ALLOWED_ON_ABSENT_FS 2
+       char *op_name;
+};
+
+static struct nfsd4_operation nfsd4_ops[];
+
+static const char *nfsd4_op_name(unsigned opnum);
+
 /*
  * COMPOUND call.
  */
@@ -787,15 +859,11 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                    struct nfsd4_compoundres *resp)
 {
        struct nfsd4_op *op;
+       struct nfsd4_operation *opdesc;
        struct nfsd4_compound_state *cstate = NULL;
        int             slack_bytes;
        __be32          status;
 
-       status = nfserr_resource;
-       cstate = cstate_alloc();
-       if (cstate == NULL)
-               goto out;
-
        resp->xbuf = &rqstp->rq_res;
        resp->p = rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len;
        resp->tagp = resp->p;
@@ -814,11 +882,18 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
        if (args->minorversion > NFSD_SUPPORTED_MINOR_VERSION)
                goto out;
 
+       status = nfserr_resource;
+       cstate = cstate_alloc();
+       if (cstate == NULL)
+               goto out;
+
        status = nfs_ok;
        while (!status && resp->opcnt < args->opcnt) {
                op = &args->ops[resp->opcnt++];
 
-               dprintk("nfsv4 compound op #%d: %d\n", resp->opcnt, op->opnum);
+               dprintk("nfsv4 compound op #%d/%d: %d (%s)\n",
+                       resp->opcnt, args->opcnt, op->opnum,
+                       nfsd4_op_name(op->opnum));
 
                /*
                 * The XDR decode routines may have pre-set op->status;
@@ -841,160 +916,23 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                        goto encode_op;
                }
 
-               /* All operations except RENEW, SETCLIENTID, RESTOREFH
-               * SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
-               * require a valid current filehandle
-               */
+               opdesc = &nfsd4_ops[op->opnum];
+
                if (!cstate->current_fh.fh_dentry) {
-                       if (!((op->opnum == OP_PUTFH) ||
-                             (op->opnum == OP_PUTROOTFH) ||
-                             (op->opnum == OP_SETCLIENTID) ||
-                             (op->opnum == OP_SETCLIENTID_CONFIRM) ||
-                             (op->opnum == OP_RENEW) ||
-                             (op->opnum == OP_RESTOREFH) ||
-                             (op->opnum == OP_RELEASE_LOCKOWNER))) {
+                       if (!(opdesc->op_flags & ALLOWED_WITHOUT_FH)) {
                                op->status = nfserr_nofilehandle;
                                goto encode_op;
                        }
-               }
-               /* Check must be done at start of each operation, except
-                * for GETATTR and ops not listed as returning NFS4ERR_MOVED
-                */
-               else if (cstate->current_fh.fh_export->ex_fslocs.migrated &&
-                        !((op->opnum == OP_GETATTR) ||
-                          (op->opnum == OP_PUTROOTFH) ||
-                          (op->opnum == OP_PUTPUBFH) ||
-                          (op->opnum == OP_RENEW) ||
-                          (op->opnum == OP_SETCLIENTID) ||
-                          (op->opnum == OP_RELEASE_LOCKOWNER))) {
+               } else if (cstate->current_fh.fh_export->ex_fslocs.migrated &&
+                         !(opdesc->op_flags & ALLOWED_ON_ABSENT_FS)) {
                        op->status = nfserr_moved;
                        goto encode_op;
                }
-               switch (op->opnum) {
-               case OP_ACCESS:
-                       op->status = nfsd4_access(rqstp, cstate,
-                                                 &op->u.access);
-                       break;
-               case OP_CLOSE:
-                       op->status = nfsd4_close(rqstp, cstate,
-                                                &op->u.close);
-                       break;
-               case OP_COMMIT:
-                       op->status = nfsd4_commit(rqstp, cstate,
-                                                 &op->u.commit);
-                       break;
-               case OP_CREATE:
-                       op->status = nfsd4_create(rqstp, cstate,
-                                                 &op->u.create);
-                       break;
-               case OP_DELEGRETURN:
-                       op->status = nfsd4_delegreturn(rqstp, cstate,
-                                                      &op->u.delegreturn);
-                       break;
-               case OP_GETATTR:
-                       op->status = nfsd4_getattr(rqstp, cstate,
-                                                  &op->u.getattr);
-                       break;
-               case OP_GETFH:
-                       op->status = nfsd4_getfh(cstate, &op->u.getfh);
-                       break;
-               case OP_LINK:
-                       op->status = nfsd4_link(rqstp, cstate, &op->u.link);
-                       break;
-               case OP_LOCK:
-                       op->status = nfsd4_lock(rqstp, cstate, &op->u.lock);
-                       break;
-               case OP_LOCKT:
-                       op->status = nfsd4_lockt(rqstp, cstate, &op->u.lockt);
-                       break;
-               case OP_LOCKU:
-                       op->status = nfsd4_locku(rqstp, cstate, &op->u.locku);
-                       break;
-               case OP_LOOKUP:
-                       op->status = nfsd4_lookup(rqstp, cstate,
-                                                 &op->u.lookup);
-                       break;
-               case OP_LOOKUPP:
-                       op->status = nfsd4_lookupp(rqstp, cstate);
-                       break;
-               case OP_NVERIFY:
-                       op->status = nfsd4_verify(rqstp, cstate,
-                                                 &op->u.nverify);
-                       if (op->status == nfserr_not_same)
-                               op->status = nfs_ok;
-                       break;
-               case OP_OPEN:
-                       op->status = nfsd4_open(rqstp, cstate,
-                                               &op->u.open);
-                       break;
-               case OP_OPEN_CONFIRM:
-                       op->status = nfsd4_open_confirm(rqstp, cstate,
-                                                       &op->u.open_confirm);
-                       break;
-               case OP_OPEN_DOWNGRADE:
-                       op->status = nfsd4_open_downgrade(rqstp, cstate,
-                                                       &op->u.open_downgrade);
-                       break;
-               case OP_PUTFH:
-                       op->status = nfsd4_putfh(rqstp, cstate, &op->u.putfh);
-                       break;
-               case OP_PUTROOTFH:
-                       op->status = nfsd4_putrootfh(rqstp, cstate);
-                       break;
-               case OP_READ:
-                       op->status = nfsd4_read(rqstp, cstate, &op->u.read);
-                       break;
-               case OP_READDIR:
-                       op->status = nfsd4_readdir(rqstp, cstate,
-                                                  &op->u.readdir);
-                       break;
-               case OP_READLINK:
-                       op->status = nfsd4_readlink(rqstp, cstate,
-                                                   &op->u.readlink);
-                       break;
-               case OP_REMOVE:
-                       op->status = nfsd4_remove(rqstp, cstate,
-                                                 &op->u.remove);
-                       break;
-               case OP_RENAME:
-                       op->status = nfsd4_rename(rqstp, cstate,
-                                                 &op->u.rename);
-                       break;
-               case OP_RENEW:
-                       op->status = nfsd4_renew(&op->u.renew);
-                       break;
-               case OP_RESTOREFH:
-                       op->status = nfsd4_restorefh(cstate);
-                       break;
-               case OP_SAVEFH:
-                       op->status = nfsd4_savefh(cstate);
-                       break;
-               case OP_SETATTR:
-                       op->status = nfsd4_setattr(rqstp, cstate,
-                                                  &op->u.setattr);
-                       break;
-               case OP_SETCLIENTID:
-                       op->status = nfsd4_setclientid(rqstp, &op->u.setclientid);
-                       break;
-               case OP_SETCLIENTID_CONFIRM:
-                       op->status = nfsd4_setclientid_confirm(rqstp, &op->u.setclientid_confirm);
-                       break;
-               case OP_VERIFY:
-                       op->status = nfsd4_verify(rqstp, cstate,
-                                                 &op->u.verify);
-                       if (op->status == nfserr_same)
-                               op->status = nfs_ok;
-                       break;
-               case OP_WRITE:
-                       op->status = nfsd4_write(rqstp, cstate, &op->u.write);
-                       break;
-               case OP_RELEASE_LOCKOWNER:
-                       op->status = nfsd4_release_lockowner(rqstp, &op->u.release_lockowner);
-                       break;
-               default:
+
+               if (opdesc->op_func)
+                       op->status = opdesc->op_func(rqstp, cstate, &op->u);
+               else
                        BUG_ON(op->status == nfs_ok);
-                       break;
-               }
 
 encode_op:
                if (op->status == nfserr_replay_me) {
@@ -1005,6 +943,11 @@ encode_op:
                        nfsd4_encode_operation(resp, op);
                        status = op->status;
                }
+
+               dprintk("nfsv4 compound op %p opcnt %d #%d: %d: status %d\n",
+                       args->ops, args->opcnt, resp->opcnt, op->opnum,
+                       be32_to_cpu(status));
+
                if (cstate->replay_owner) {
                        nfs4_put_stateowner(cstate->replay_owner);
                        cstate->replay_owner = NULL;
@@ -1016,12 +959,172 @@ encode_op:
                nfsd4_increment_op_stats(op->opnum);
        }
 
+       cstate_free(cstate);
 out:
        nfsd4_release_compoundargs(args);
-       cstate_free(cstate);
+       dprintk("nfsv4 compound returned %d\n", ntohl(status));
        return status;
 }
 
+static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
+       [OP_ACCESS] = {
+               .op_func = (nfsd4op_func)nfsd4_access,
+               .op_name = "OP_ACCESS",
+       },
+       [OP_CLOSE] = {
+               .op_func = (nfsd4op_func)nfsd4_close,
+               .op_name = "OP_CLOSE",
+       },
+       [OP_COMMIT] = {
+               .op_func = (nfsd4op_func)nfsd4_commit,
+               .op_name = "OP_COMMIT",
+       },
+       [OP_CREATE] = {
+               .op_func = (nfsd4op_func)nfsd4_create,
+               .op_name = "OP_CREATE",
+       },
+       [OP_DELEGRETURN] = {
+               .op_func = (nfsd4op_func)nfsd4_delegreturn,
+               .op_name = "OP_DELEGRETURN",
+       },
+       [OP_GETATTR] = {
+               .op_func = (nfsd4op_func)nfsd4_getattr,
+               .op_flags = ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_GETATTR",
+       },
+       [OP_GETFH] = {
+               .op_func = (nfsd4op_func)nfsd4_getfh,
+               .op_name = "OP_GETFH",
+       },
+       [OP_LINK] = {
+               .op_func = (nfsd4op_func)nfsd4_link,
+               .op_name = "OP_LINK",
+       },
+       [OP_LOCK] = {
+               .op_func = (nfsd4op_func)nfsd4_lock,
+               .op_name = "OP_LOCK",
+       },
+       [OP_LOCKT] = {
+               .op_func = (nfsd4op_func)nfsd4_lockt,
+               .op_name = "OP_LOCKT",
+       },
+       [OP_LOCKU] = {
+               .op_func = (nfsd4op_func)nfsd4_locku,
+               .op_name = "OP_LOCKU",
+       },
+       [OP_LOOKUP] = {
+               .op_func = (nfsd4op_func)nfsd4_lookup,
+               .op_name = "OP_LOOKUP",
+       },
+       [OP_LOOKUPP] = {
+               .op_func = (nfsd4op_func)nfsd4_lookupp,
+               .op_name = "OP_LOOKUPP",
+       },
+       [OP_NVERIFY] = {
+               .op_func = (nfsd4op_func)nfsd4_nverify,
+               .op_name = "OP_NVERIFY",
+       },
+       [OP_OPEN] = {
+               .op_func = (nfsd4op_func)nfsd4_open,
+               .op_name = "OP_OPEN",
+       },
+       [OP_OPEN_CONFIRM] = {
+               .op_func = (nfsd4op_func)nfsd4_open_confirm,
+               .op_name = "OP_OPEN_CONFIRM",
+       },
+       [OP_OPEN_DOWNGRADE] = {
+               .op_func = (nfsd4op_func)nfsd4_open_downgrade,
+               .op_name = "OP_OPEN_DOWNGRADE",
+       },
+       [OP_PUTFH] = {
+               .op_func = (nfsd4op_func)nfsd4_putfh,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_PUTFH",
+       },
+       [OP_PUTPUBFH] = {
+               /* unsupported, just for future reference: */
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_PUTPUBFH",
+       },
+       [OP_PUTROOTFH] = {
+               .op_func = (nfsd4op_func)nfsd4_putrootfh,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_PUTROOTFH",
+       },
+       [OP_READ] = {
+               .op_func = (nfsd4op_func)nfsd4_read,
+               .op_name = "OP_READ",
+       },
+       [OP_READDIR] = {
+               .op_func = (nfsd4op_func)nfsd4_readdir,
+               .op_name = "OP_READDIR",
+       },
+       [OP_READLINK] = {
+               .op_func = (nfsd4op_func)nfsd4_readlink,
+               .op_name = "OP_READLINK",
+       },
+       [OP_REMOVE] = {
+               .op_func = (nfsd4op_func)nfsd4_remove,
+               .op_name = "OP_REMOVE",
+       },
+       [OP_RENAME] = {
+               .op_name = "OP_RENAME",
+               .op_func = (nfsd4op_func)nfsd4_rename,
+       },
+       [OP_RENEW] = {
+               .op_func = (nfsd4op_func)nfsd4_renew,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_RENEW",
+       },
+       [OP_RESTOREFH] = {
+               .op_func = (nfsd4op_func)nfsd4_restorefh,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_RESTOREFH",
+       },
+       [OP_SAVEFH] = {
+               .op_func = (nfsd4op_func)nfsd4_savefh,
+               .op_name = "OP_SAVEFH",
+       },
+       [OP_SECINFO] = {
+               .op_func = (nfsd4op_func)nfsd4_secinfo,
+               .op_name = "OP_SECINFO",
+       },
+       [OP_SETATTR] = {
+               .op_func = (nfsd4op_func)nfsd4_setattr,
+               .op_name = "OP_SETATTR",
+       },
+       [OP_SETCLIENTID] = {
+               .op_func = (nfsd4op_func)nfsd4_setclientid,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_SETCLIENTID",
+       },
+       [OP_SETCLIENTID_CONFIRM] = {
+               .op_func = (nfsd4op_func)nfsd4_setclientid_confirm,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_SETCLIENTID_CONFIRM",
+       },
+       [OP_VERIFY] = {
+               .op_func = (nfsd4op_func)nfsd4_verify,
+               .op_name = "OP_VERIFY",
+       },
+       [OP_WRITE] = {
+               .op_func = (nfsd4op_func)nfsd4_write,
+               .op_name = "OP_WRITE",
+       },
+       [OP_RELEASE_LOCKOWNER] = {
+               .op_func = (nfsd4op_func)nfsd4_release_lockowner,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+               .op_name = "OP_RELEASE_LOCKOWNER",
+       },
+};
+
+static const char *nfsd4_op_name(unsigned opnum)
+{
+       if (opnum < ARRAY_SIZE(nfsd4_ops))
+               return nfsd4_ops[opnum].op_name;
+       return "unknown_operation";
+}
+
 #define nfs4svc_decode_voidargs                NULL
 #define nfs4svc_release_void           NULL
 #define nfsd4_voidres                  nfsd4_voidargs