From: adilger <adilger>
Date: Wed, 6 Oct 2004 19:03:37 +0000 (+0000)
Subject: Branch: b1_2
X-Git-Tag: v1_8_0_110~486^5~151
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=e9ab60648b1a761862bce41fb432a8b471b6f0aa;p=fs%2Flustre-release.git

Branch: b1_2
Add fix for SUPERBH_MAX_USERS
b=4505
---

diff --git a/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch b/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch
index 2a834ac..9349422 100644
--- a/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/blkdev_tunables-2.4.21-chaos.patch
@@ -32,3 +32,14 @@
  
  /*
   * bh abuse :/
+--- ./mm/highmem.c.orig	2004-09-11 08:16:19.000000000 -0600
++++ ./mm/highmem.c	2004-10-06 11:52:34.000000000 -0600
+@@ -465,7 +465,7 @@ struct buffer_head * create_bounce(int r
+ /*
+  * FIXME: assuming PAGE_SIZE buffer_heads
+  */
+-#define SUPERBH_MAX_USERS	(POOL_SIZE * PAGE_SIZE / MAX_SUPERBH)
++#define SUPERBH_MAX_USERS	max(POOL_SIZE * PAGE_SIZE / MAX_SUPERBH, 1)
+ 
+ static int superbh_users;
+ static DECLARE_WAIT_QUEUE_HEAD(superbh_wait);