From a1657863696aa6c8bc085e41656281559e1abd0d Mon Sep 17 00:00:00 2001
From: Jovi Zhang <bookjovi@gmail.com>
Date: Wed, 2 Mar 2011 23:19:37 +0000
Subject: [PATCH] --- yaml --- r: 234114 b: refs/heads/master c:
 43b7c3f051dea504afccc39bcb56d8e26c2e0b77 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dad23754231c..a3bf837858d2 100644
--- 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
index d1ed67145cf3..b07d4e23b876 100644
--- 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)