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

[PATCH] knfsd: nfsd4: simplify filehandle check 



Kill another big "if" clause.

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 eeac294e

fs/nfsd/nfs4proc.c

+12 −17
Original line number Diff line number Diff line
@@ -802,8 +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 1

#define ALLOWED_ON_ABSENT_FS 2

};



static struct nfsd4_operation nfsd4_ops[];
@@ -874,18 +876,8 @@ 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;

			}
@@ -981,14 +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_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

	},

	[OP_PUTROOTFH] = {

		.op_func = (nfsd4op_func)nfsd4_putrootfh,

		.op_flags = ALLOWED_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

	},

	[OP_READ] = {

		.op_func = (nfsd4op_func)nfsd4_read,
@@ -1007,10 +1000,11 @@ 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_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,10 +1014,11 @@ 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_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,
@@ -1033,7 +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_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

	},

};