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);