summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJovi Zhang <bookjovi@gmail.com>2011-03-02 23:19:37 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-09 15:55:13 -0700
commit9aa01fe50360df5e502e1098c9446cbdf51c9672 (patch)
tree3877a76643d55aaa938c7a30d228296569932b96
parente91d9d0e8727bb039e32704a5460abe27ecb2df3 (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>
-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 901b0a4e7c10..eb4421bb1ac3 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3142,7 +3142,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)