Commit 094b5d74 authored Jun 16, 2011 by Benny Halevy Committed by J. Bruce Fields Jul 15, 2011

NFSD: allow OP_DESTROY_CLIENTID to be only op in COMPOUND



   DESTROY_CLIENTID MAY be preceded with a SEQUENCE operation as long as
   the client ID derived from the session ID of SEQUENCE is not the same
   as the client ID to be destroyed.  If the client IDs are the same,
   then the server MUST return NFS4ERR_CLIENTID_BUSY.

(that's not implemented yet)

   If DESTROY_CLIENTID is not prefixed by SEQUENCE, it MUST be the only
   operation in the COMPOUND request (otherwise, the server MUST return
   NFS4ERR_NOT_ONLY_OP).

This fixes the error return; before, we returned
NFS4ERR_OP_NOT_IN_SESSION; after this patch, we return NFS4ERR_NOTSUPP.

Signed-off-by: Benny Halevy <benny@tonian.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 51414d41

fs/nfsd/nfs4proc.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1402,6 +1402,11 @@ static struct nfsd4_operation nfsd4_ops[] = {
		.op_flags = ALLOWED_WITHOUT_FH \| ALLOWED_AS_FIRST_OP,
		.op_name = "OP_SEQUENCE",
		},
		[OP_DESTROY_CLIENTID] = {
		.op_func = NULL,
		.op_flags = ALLOWED_WITHOUT_FH \| ALLOWED_AS_FIRST_OP,
		.op_name = "OP_DESTROY_CLIENTID",
		},
		[OP_RECLAIM_COMPLETE] = {
		.op_func = (nfsd4op_func)nfsd4_reclaim_complete,
		.op_flags = ALLOWED_WITHOUT_FH,

Admin message