---

yaml --- r: 234114 b: refs/heads/master c: 43b7c3f h: refs/heads/master v: v3
git-mirror · Mar 10, 2011 · a165786 · a165786
1 parent 37e3d1c
commit a165786
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9f810570d9cc13177128e11a74e22d37aa68a1a
+refs/heads/master: 43b7c3f051dea504afccc39bcb56d8e26c2e0b77
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
@@ -3262,7 +3262,7 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
 	spages = pages;
 
 	do {
-		len = min(PAGE_CACHE_SIZE, buflen);
+		len = min_t(size_t, PAGE_CACHE_SIZE, buflen);
 		newpage = alloc_page(GFP_KERNEL);
 
 		if (newpage == NULL)