From: adilger <adilger>
Date: Mon, 22 Sep 2008 20:57:54 +0000 (+0000)
Subject: Branch HEAD
X-Git-Tag: v1_9_80~72
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fab1fe1204a40370b68b7de8da07f856d92b5ef0;ds=sidebyside

Branch HEAD
Fix patch context to allow applying to previous kernel.
b=16498
---

diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch
index 57d03c3..0e6e14e 100644
--- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch
@@ -65,10 +65,11 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/resize.c
  
  #define outside(b, first, last)	((b) < (first) || (b) >= (last))
  #define inside(b, first, last)	((b) >= (first) && (b) < (last))
-@@ -134,25 +135,6 @@ static struct buffer_head *bclean(handle
+@@ -133,25 +134,6 @@ static struct buffer_head *bclean(handle
+ 	return bh;
  }
  
- /*
+-/*
 - * To avoid calling the atomic setbit hundreds or thousands of times, we only
 - * need to use it within a single byte (to ensure we get endianness right).
 - * We can use memset for the rest of the bitmap as there are no other users.
@@ -87,10 +88,9 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/resize.c
 -		memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3);
 -}
 -
--/*
+ /*
   * If we have fewer than thresh credits, extend by EXT3_MAX_TRANS_DATA.
   * If that fails, restart the transaction & regain write access for the
-  * buffer head which is used for block_bitmap modifications.
 @@ -818,6 +800,7 @@ int ext3_group_add(struct super_block *s
  	gdp->bg_inode_table = cpu_to_le32(input->inode_table);
  	gdp->bg_free_blocks_count = cpu_to_le16(input->free_blocks_count);