From e07e9d210e4cbcdbb4375fe3765127c8a27477b2 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 16 Oct 2002 06:00:41 +0000
Subject: [PATCH] Remove bogus hunks from the -12.5 RH kernel patch.

---
 lustre/patches/patch-2.4.18-12.5 | 33 ---------------------------------
 lustre/patches/patch-2.4.18-um   | 23 +++++++++++------------
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/lustre/patches/patch-2.4.18-12.5 b/lustre/patches/patch-2.4.18-12.5
index cf81ce7..2b1a449 100644
--- a/lustre/patches/patch-2.4.18-12.5
+++ b/lustre/patches/patch-2.4.18-12.5
@@ -120,39 +120,6 @@
  
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
---- linux-2.4.18-12-uml-pristine/fs/jbd/commit.c	Mon Sep  9 14:41:57 2002
-+++ linux-2.4.18-12-uml/fs/jbd/commit.c	Mon Sep  9 16:08:12 2002
-@@ -598,7 +598,6 @@
- 	descriptor = journal_get_descriptor_buffer(journal);
- 	if (!descriptor) {
- 		__journal_abort_hard(journal);
--		unlock_journal(journal);
- 		goto skip_commit;
- 	}
- 
---- linux-2.4.18-12-uml-pristine/fs/jbd/transaction.c	Mon Sep  9 14:41:57 2002
-+++ linux-2.4.18-12-uml/fs/jbd/transaction.c	Mon Sep  9 16:29:50 2002
-@@ -223,6 +223,20 @@
- 	return handle;
- }
- 
-+/* Allocate a new handle.  This should probably be in a slab... */
-+static handle_t *get_handle(int nblocks)
-+{
-+	handle_t *handle = jbd_kmalloc(sizeof (handle_t), GFP_NOFS);
-+	if (!handle)
-+		return NULL;
-+	memset(handle, 0, sizeof (handle_t));
-+	handle->h_buffer_credits = nblocks;
-+	handle->h_ref = 1;
-+	INIT_LIST_HEAD(&handle->h_jcb);
-+
-+	return handle;
-+}
-+
- /*
-  * Obtain a new handle.  
-  *
 --- linux-2.4.18-12-uml-pristine/include/linux/blkdev.h	Wed Sep 11 12:32:08 2002
 +++ linux-2.4.18-12-uml/include/linux/blkdev.h	Wed Sep 18 15:52:17 2002
 @@ -277,4 +277,10 @@
diff --git a/lustre/patches/patch-2.4.18-um b/lustre/patches/patch-2.4.18-um
index 46b66f3..6e1e345 100644
--- a/lustre/patches/patch-2.4.18-um
+++ b/lustre/patches/patch-2.4.18-um
@@ -1,25 +1,24 @@
 --- lum-pristine/arch/um/kernel/mem.c	Mon Aug 12 11:05:20 2002
 +++ lum/arch/um/kernel/mem.c	Thu Aug  1 18:07:35 2002
-@@ -527,6 +527,22 @@
+@@ -527,6 +527,21 @@
  	return(phys_mem_map(pte_val(pte)));
  }
  
 +struct page *check_get_page(unsigned long kaddr)
 +{
-+        struct page *page;
-+        struct mem_region *mr;
-+        unsigned long phys = __pa(kaddr);
++	struct page *page;
++	struct mem_region *mr;
++	unsigned long phys = __pa(kaddr);
 +	unsigned int n = phys_region_index(phys);
 +
-+	if(regions[n] == NULL) 
-+                return NULL; 
++	if (regions[n] == NULL)
++                return NULL;
 +
-+        mr = regions[n];
-+        page = (struct page *) mr->mem_map;
++	mr = regions[n];
++	page = (struct page *) mr->mem_map;
 +	return page + ((phys_addr(phys)) >> PAGE_SHIFT);
 +}
 +
-+
  struct mem_region *page_region(struct page *page, int *index_out)
  {
  	int i;
@@ -28,14 +27,14 @@
  		}
  	}
 -	panic("No region found for page");
-+//panic("No region found for page");
++	//panic("No region found for page");
  	return(NULL);
  }
  
  struct page *page_mem_map(struct page *page)
  {
-+        if (!page_region(page, NULL))
-+            return NULL; 
++	if (!page_region(page, NULL))
++		return NULL; 
  	return((struct page *) page_region(page, NULL)->mem_map);
  }
  
-- 
1.8.3.1