From: braam <braam>
Date: Wed, 9 Apr 2003 10:25:07 +0000 (+0000)
Subject: This gives a good first shot at fixing the patch management issues:
X-Git-Tag: v1_7_100~1^90~71
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=4c58f37fe5b01985169d81c2855905f9193ca454;p=fs%2Flustre-release.git

This gives a good first shot at fixing the patch management issues:

 - we followed the instructions that are being posted on the wiki
   and wich were discussed this morning

 - patches are now fairly easy to create and update
---

diff --git a/lustre/kernel_patches/patches/export-truncate.patch b/lustre/kernel_patches/patches/export-truncate.patch
index 12e6f440b..2cd96b9 100644
--- a/lustre/kernel_patches/patches/export-truncate.patch
+++ b/lustre/kernel_patches/patches/export-truncate.patch
@@ -1,6 +1,10 @@
---- linux/include/linux/mm.h.truncexport	2003-03-21 20:03:18.000000000 -0500
-+++ linux/include/linux/mm.h	2003-03-21 20:05:04.000000000 -0500
-@@ -650,6 +650,7 @@
+ include/linux/mm.h |    1 +
+ mm/filemap.c       |    3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- linux-2.4.18-18/include/linux/mm.h~export-truncate	2003-04-05 02:54:55.000000000 -0700
++++ linux-2.4.18-18-braam/include/linux/mm.h	2003-04-09 17:37:46.000000000 -0600
+@@ -650,6 +650,7 @@ struct zone_t;
  /* filemap.c */
  extern void remove_inode_page(struct page *);
  extern unsigned long page_unuse(struct page *);
@@ -8,9 +12,9 @@
  extern void truncate_inode_pages(struct address_space *, loff_t);
  
  /* generic vm_area_ops exported for stackable file systems */
---- linux/mm/filemap.c.truncexport	2003-03-21 20:01:19.000000000 -0500
-+++ linux/mm/filemap.c	2003-03-21 20:01:41.000000000 -0500
-@@ -245,7 +245,7 @@
+--- linux-2.4.18-18/mm/filemap.c~export-truncate	2003-04-05 02:54:55.000000000 -0700
++++ linux-2.4.18-18-braam/mm/filemap.c	2003-04-09 17:37:46.000000000 -0600
+@@ -245,7 +245,7 @@ static inline void truncate_partial_page
  		do_flushpage(page, partial);
  }
  
@@ -19,7 +23,7 @@
  {
  	/*
  	 * Leave it on the LRU if it gets converted into anonymous buffers
-@@ -266,6 +266,7 @@
+@@ -266,6 +266,7 @@ static void truncate_complete_page(struc
  	remove_inode_page(page);
  	page_cache_release(page);
  }
@@ -27,3 +31,5 @@
  
  static int FASTCALL(truncate_list_pages(struct list_head *, unsigned long, unsigned *));
  static int truncate_list_pages(struct list_head *head, unsigned long start, unsigned *partial)
+
+_