.37 patches

diff --git a/queue-2.6.37/nfs-fix-compilation-warning.patch b/queue-2.6.37/nfs-fix-compilation-warning.patch
new file mode 100644 (file)
index 0000000..df6b117
--- /dev/null
+++ b/queue-2.6.37/nfs-fix-compilation-warning.patch
@@ -0,0 +1,31 @@
+From 43b7c3f051dea504afccc39bcb56d8e26c2e0b77 Mon Sep 17 00:00:00 2001
+From: Jovi Zhang <bookjovi@gmail.com>
+Date: Wed, 2 Mar 2011 23:19:37 +0000
+Subject: nfs: fix compilation warning
+
+From: Jovi Zhang <bookjovi@gmail.com>
+
+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 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -3226,7 +3226,7 @@ static int buf_to_pages_noslab(const voi
+       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)

diff --git a/queue-2.6.37/series b/queue-2.6.37/series
index c1f0400d930d7f8d382e9af7223c61a24f345148..caacb4fc1b79085872869a4410ff633393b157c1 100644 (file)
--- a/queue-2.6.37/series
+++ b/queue-2.6.37/series
@@ -14,3 +14,4 @@ rt2x00-fix-crash-on-usb-unplug.patch
 rt2x00-fix-hang-when-unplugging-usb-device-in-use.patch
 drm-i915-fix-calculation-of-backlight-value-in-combined-mode.patch
 block-fix-mis-synchronisation-in-blkdev_issue_zeroout.patch
+nfs-fix-compilation-warning.patch