From c8ca00ac11a4f9ec7bec215fd463a208681c4bdc Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 1 Nov 2007 16:57:20 -0400
Subject: [PATCH] --- yaml --- r: 82413 b: refs/heads/master c:
 a628f6675861d979405f751418e924c4ec7d457d h: refs/heads/master i:   82411:
 65edbdecea2d36c6d203b4a6bcf5bba9b9b1fae4 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs3xdr.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 385acec60295..7f4ac119cedd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7544d3a195cde33b3d1e46639b23c221f901db
+refs/heads/master: a628f6675861d979405f751418e924c4ec7d457d
diff --git a/trunk/fs/nfsd/nfs3xdr.c b/trunk/fs/nfsd/nfs3xdr.c
index c02b8d69297d..be515c5a8154 100644
--- a/trunk/fs/nfsd/nfs3xdr.c
+++ b/trunk/fs/nfsd/nfs3xdr.c
@@ -452,8 +452,7 @@ int
 nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p,
 					struct nfsd3_symlinkargs *args)
 {
-	unsigned int len;
-	int avail;
+	unsigned int len, avail;
 	char *old, *new;
 	struct kvec *vec;
 
@@ -486,7 +485,8 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p,
 	/* now copy next page if there is one */
 	if (len && !avail && rqstp->rq_arg.page_len) {
 		avail = rqstp->rq_arg.page_len;
-		if (avail > PAGE_SIZE) avail = PAGE_SIZE;
+		if (avail > PAGE_SIZE)
+			avail = PAGE_SIZE;
 		old = page_address(rqstp->rq_arg.pages[0]);
 	}
 	while (len && avail && *old) {