]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
nfs: fix compilation warning
authorJovi Zhang <bookjovi@gmail.com>
Wed, 2 Mar 2011 23:19:37 +0000 (23:19 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Mar 2011 19:49:59 +0000 (12:49 -0700)
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>
fs/nfs/nfs4proc.c

index c2c7a6bfb4c7a6b60ae20cb1ddaf5f6f802b8075..d851c0755ae14ab3bd1bc11299b4ca61850618b1 100644 (file)
@@ -3226,7 +3226,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)