Commit a872c731 authored by Chuck Lever's avatar Chuck Lever
Browse files

lockd: Remove some snippets of unfinished code 



Clean up.

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent e5948841

fs/lockd/svc4proc.c

+0 −12
Original line number Diff line number Diff line
@@ -142,18 +142,6 @@ __nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp) 
	if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))

		return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;



#if 0

	/* If supplied state doesn't match current state, we assume it's

	 * an old request that time-warped somehow. Any error return would

	 * do in this case because it's irrelevant anyway.

	 *

	 * NB: We don't retrieve the remote host's state yet.

	 */

	if (host->h_nsmstate && host->h_nsmstate != argp->state) {

		resp->status = nlm_lck_denied_nolocks;

	} else

#endif



	/* Now try to lock the file */

	resp->status = nlmsvc_lock(rqstp, file, host, &argp->lock,

					argp->block, &argp->cookie,

fs/lockd/svcproc.c

+0 −12
Original line number Diff line number Diff line
@@ -165,18 +165,6 @@ __nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp) 
	if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host, &file)))

		return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;



#if 0

	/* If supplied state doesn't match current state, we assume it's

	 * an old request that time-warped somehow. Any error return would

	 * do in this case because it's irrelevant anyway.

	 *

	 * NB: We don't retrieve the remote host's state yet.

	 */

	if (host->h_nsmstate && host->h_nsmstate != argp->state) {

		resp->status = nlm_lck_denied_nolocks;

	} else

#endif



	/* Now try to lock the file */

	resp->status = cast_status(nlmsvc_lock(rqstp, file, host, &argp->lock,

					       argp->block, &argp->cookie,