Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / fs / nfsd / nfs4proc.c

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index e1c463bad12417493e94af3c66999e76b1e72a55..8522729830db99832d37d2bac393760fe2a58d61 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -802,6 +802,10 @@ typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
 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
 };
 
 static struct nfsd4_operation nfsd4_ops[];
@@ -872,32 +876,13 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
 
                opdesc = &nfsd4_ops[op->opnum];
 
-               /* All operations except RENEW, SETCLIENTID, RESTOREFH
-               * SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH
-               * require a valid current filehandle
-               */
                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;
                }
@@ -951,6 +936,7 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
        },
        [OP_GETATTR] = {
                .op_func = (nfsd4op_func)nfsd4_getattr,
+               .op_flags = ALLOWED_ON_ABSENT_FS,
        },
        [OP_GETFH] = {
                .op_func = (nfsd4op_func)nfsd4_getfh,
@@ -987,9 +973,15 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
        },
        [OP_PUTFH] = {
                .op_func = (nfsd4op_func)nfsd4_putfh,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
+       },
+       [OP_PUTPUBFH] = {
+               /* unsupported; just for future reference: */
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
        [OP_PUTROOTFH] = {
                .op_func = (nfsd4op_func)nfsd4_putrootfh,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
        [OP_READ] = {
                .op_func = (nfsd4op_func)nfsd4_read,
@@ -1008,9 +1000,11 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
        },
        [OP_RENEW] = {
                .op_func = (nfsd4op_func)nfsd4_renew,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
        [OP_RESTOREFH] = {
                .op_func = (nfsd4op_func)nfsd4_restorefh,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
        [OP_SAVEFH] = {
                .op_func = (nfsd4op_func)nfsd4_savefh,
@@ -1020,9 +1014,11 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
        },
        [OP_SETCLIENTID] = {
                .op_func = (nfsd4op_func)nfsd4_setclientid,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
        [OP_SETCLIENTID_CONFIRM] = {
                .op_func = (nfsd4op_func)nfsd4_setclientid_confirm,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
        [OP_VERIFY] = {
                .op_func = (nfsd4op_func)nfsd4_verify,
@@ -1032,6 +1028,7 @@ static struct nfsd4_operation nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
        },
        [OP_RELEASE_LOCKOWNER] = {
                .op_func = (nfsd4op_func)nfsd4_release_lockowner,
+               .op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
        },
 };