Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeac294e authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds
Browse files

[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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b591480b

fs/nfsd/nfs4proc.c

+13 −11
Original line number Diff line number Diff line
@@ -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,

	},

};