From b300ee81ee435cef8b688255244b4838887b877a Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Fri, 3 Oct 2008 12:50:51 -0400 Subject: [PATCH] --- yaml --- r: 114344 b: refs/heads/master c: 9a38a83880c224c6a3fd973ac9ae30a043487f0f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/lockd/xdr.c | 2 -- trunk/fs/lockd/xdr4.c | 2 -- trunk/include/linux/lockd/xdr.h | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 19d397d3b757..6aa43eab5744 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b85e4676344fc4d7ec5e0f62c3d3712e48bbe223 +refs/heads/master: 9a38a83880c224c6a3fd973ac9ae30a043487f0f diff --git a/trunk/fs/lockd/xdr.c b/trunk/fs/lockd/xdr.c index 3e459e18cc31..1f226290c67c 100644 --- a/trunk/fs/lockd/xdr.c +++ b/trunk/fs/lockd/xdr.c @@ -351,8 +351,6 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp) argp->state = ntohl(*p++); /* Preserve the address in network byte order */ argp->addr = *p++; - argp->vers = *p++; - argp->proto = *p++; return xdr_argsize_check(rqstp, p); } diff --git a/trunk/fs/lockd/xdr4.c b/trunk/fs/lockd/xdr4.c index 43ff9397e6c6..50c493a8ad8e 100644 --- a/trunk/fs/lockd/xdr4.c +++ b/trunk/fs/lockd/xdr4.c @@ -358,8 +358,6 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp argp->state = ntohl(*p++); /* Preserve the address in network byte order */ argp->addr = *p++; - argp->vers = *p++; - argp->proto = *p++; return xdr_argsize_check(rqstp, p); } diff --git a/trunk/include/linux/lockd/xdr.h b/trunk/include/linux/lockd/xdr.h index df18fa053bcd..d6b3a802c046 100644 --- a/trunk/include/linux/lockd/xdr.h +++ b/trunk/include/linux/lockd/xdr.h @@ -81,8 +81,6 @@ struct nlm_reboot { unsigned int len; u32 state; __be32 addr; - __be32 vers; - __be32 proto; }; /*