From 591f43ef803be4ef1b0d1b6683575a065b57d729 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 7 May 2010 13:33:48 -0400
Subject: [PATCH] --- yaml --- r: 192319 b: refs/heads/master c:
 0f15c53d5b1829c10dd901f37b8263aa25ecf864 h: refs/heads/master i:   192317:
 79342d5d8b38c26b6f663e2e1d5a3ee4331e4ebe   192315:
 d438753cd92471c74dac75bbec56ec86509e4dfb   192311:
 67e4804f79ab12d0e7d8d0982ed7630a1c2c02eb   192303:
 f41470196d2383f2bc1517bb7bf9e45f2cebd449   192287:
 cd27806d09396dc00d2186d583353d1310147d86   192255:
 9546a77f6f4e0d2ba483d095c88d39719fd0d527 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfs/fscache.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1c67ba58a86f..cf15eaafd657 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9605a069f83d999e60cd57dc8010708fe08291c0
+refs/heads/master: 0f15c53d5b1829c10dd901f37b8263aa25ecf864
diff --git a/trunk/fs/nfs/fscache.c b/trunk/fs/nfs/fscache.c
index a6b16ed93229..ce153a6b3aec 100644
--- a/trunk/fs/nfs/fscache.c
+++ b/trunk/fs/nfs/fscache.c
@@ -467,7 +467,8 @@ int __nfs_readpages_from_fscache(struct nfs_open_context *ctx,
 				 struct list_head *pages,
 				 unsigned *nr_pages)
 {
-	int ret, npages = *nr_pages;
+	unsigned npages = *nr_pages;
+	int ret;
 
 	dfprintk(FSCACHE, "NFS: nfs_getpages_from_fscache (0x%p/%u/0x%p)\n",
 		 NFS_I(inode)->fscache, npages, inode);