Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=eeac294ebd9254a937d90b00c48863e3af229047
Commit: eeac294ebd9254a937d90b00c48863e3af229047
Parent: b591480bbe1a7f0e90533bce8ea86efecc84648e
Author: J.Bruce Fields <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 13 00:35:39 2006 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Dec 13 09:05:54 2006 -0800
[PATCH] knfsd: nfsd4: simplify migration op check
I'm not too fond of these big if conditions. Replace them by checks of a
flag
in the operation descriptor. To my eye this makes the code a bit more
self-documenting, and makes the complicated part of the code
(proc_compound) a
little more compact.
Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
Signed-off-by: Neil Brown <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
fs/nfsd/nfs4proc.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index e1c463b..3a652e7 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -802,6 +802,8 @@ typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct
nfsd4_compound_state *,
struct nfsd4_operation {
nfsd4op_func op_func;
u32 op_flags;
+/* GETATTR and ops not listed as returning NFS4ERR_MOVED: */
+#define ALLOWED_ON_ABSENT_FS 1
};
static struct nfsd4_operation nfsd4_ops[];
@@ -887,17 +889,8 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
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 +944,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,
@@ -988,8 +982,13 @@ static struct nfsd4_operation
nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
[OP_PUTFH] = {
.op_func = (nfsd4op_func)nfsd4_putfh,
},
+ [OP_PUTPUBFH] = {
+ /* unsupported; just for future reference: */
+ .op_flags = ALLOWED_ON_ABSENT_FS,
+ },
[OP_PUTROOTFH] = {
.op_func = (nfsd4op_func)nfsd4_putrootfh,
+ .op_flags = ALLOWED_ON_ABSENT_FS,
},
[OP_READ] = {
.op_func = (nfsd4op_func)nfsd4_read,
@@ -1008,6 +1007,7 @@ static struct nfsd4_operation
nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
},
[OP_RENEW] = {
.op_func = (nfsd4op_func)nfsd4_renew,
+ .op_flags = ALLOWED_ON_ABSENT_FS,
},
[OP_RESTOREFH] = {
.op_func = (nfsd4op_func)nfsd4_restorefh,
@@ -1020,6 +1020,7 @@ static struct nfsd4_operation
nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
},
[OP_SETCLIENTID] = {
.op_func = (nfsd4op_func)nfsd4_setclientid,
+ .op_flags = ALLOWED_ON_ABSENT_FS,
},
[OP_SETCLIENTID_CONFIRM] = {
.op_func = (nfsd4op_func)nfsd4_setclientid_confirm,
@@ -1032,6 +1033,7 @@ static struct nfsd4_operation
nfsd4_ops[OP_RELEASE_LOCKOWNER+1] = {
},
[OP_RELEASE_LOCKOWNER] = {
.op_func = (nfsd4op_func)nfsd4_release_lockowner,
+ .op_flags = ALLOWED_ON_ABSENT_FS,
},
};
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
