---

yaml --- r: 320222 b: refs/heads/master c: 56d08fe h: refs/heads/master v: v3
git-mirror · Jul 16, 2012 · 8d700e1 · 8d700e1
1 parent 8cfc9ba
commit 8d700e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38527b153a7b43e5c8103f0c2d901d11cfa26d30
+refs/heads/master: 56d08fef2369d5ca9ad2e1fc697f5379fd8af751
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
@@ -3775,7 +3775,8 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu
 		.rpc_argp = &args,
 		.rpc_resp = &res,
 	};
-	int ret = -ENOMEM, npages, i, acl_len = 0;
+	int ret = -ENOMEM, npages, i;
+	size_t acl_len = 0;
 
 	npages = (buflen + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	/* As long as we're doing a round trip to the server anyway,