summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJovi Zhang <bookjovi@gmail.com>2011-03-02 23:19:37 +0000
committerAndi Kleen <ak@linux.intel.com>2011-08-01 13:54:44 -0700
commit36a01162f9a6d45d87ffe118f72ec9bc9853acdf (patch)
tree317ead1853906a22daa1d1dab0cf0987b58f9cb2
parent96f19d2bbf2bd7405cde6de18378276267015c04 (diff)
nfs: fix compilation warning
commit 43b7c3f051dea504afccc39bcb56d8e26c2e0b77 upstream. this commit fix compilation warning as following: linux-2.6/fs/nfs/nfs4proc.c:3265: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Jovi Zhang <bookjovi@gmail.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b9f6ab66b142..80943d88252a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3284,7 +3284,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)