1 files changed, 51 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0079-pnfsblock-limit-bio-page-count.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0079-pnfsblock-limit-bio-page-count.patch
new file mode 100644
index 00000000..74d1d69d
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0079-pnfsblock-limit-bio-page-count.patch
@@ -0,0 +1,51 @@
+From 4ebc5f6665b0d03c9488fafb7ac6f8bd2f104d70 Mon Sep 17 00:00:00 2001
+From: Peng Tao <bergwolf@gmail.com>
+Date: Thu, 12 Jan 2012 23:18:48 +0800
+Subject: [PATCH 079/130] pnfsblock: limit bio page count
+
+commit 74a6eeb44ca6174d9cc93b9b8b4d58211c57bc80 upstream.
+
+One bio can have at most BIO_MAX_PAGES pages. We should limit it bec otherwise
+bio_alloc will fail when there are many pages in one read/write_pagelist.
+
+Signed-off-by: Peng Tao <peng_tao@emc.com>
+Signed-off-by: Benny Halevy <bhalevy@tonian.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ fs/nfs/blocklayout/blocklayout.c |   17 +++++++++++------
+ 1 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
+index ce8129d..3db6b82 100644
+--- a/fs/nfs/blocklayout/blocklayout.c
++++ b/fs/nfs/blocklayout/blocklayout.c
+@@ -146,14 +146,19 @@ static struct bio *bl_alloc_init_bio(int npg, sector_t isect,
+ {
+        struct bio *bio;
+ 
++       npg = min(npg, BIO_MAX_PAGES);
+        bio = bio_alloc(GFP_NOIO, npg);
+-       if (!bio)
+-               return NULL;
++       if (!bio && (current->flags & PF_MEMALLOC)) {
++               while (!bio && (npg /= 2))
++                       bio = bio_alloc(GFP_NOIO, npg);
++       }
+ 
+-       bio->bi_sector = isect - be->be_f_offset + be->be_v_offset;
+-       bio->bi_bdev = be->be_mdev;
+-       bio->bi_end_io = end_io;
+-       bio->bi_private = par;
++       if (bio) {
++               bio->bi_sector = isect - be->be_f_offset + be->be_v_offset;
++               bio->bi_bdev = be->be_mdev;
++               bio->bi_end_io = end_io;
++               bio->bi_private = par;
++       }
+        return bio;
+ }
+ 
+-- 
+1.7.7.4
+