From: adilger <adilger>
Date: Fri, 5 Sep 2003 00:04:42 +0000 (+0000)
Subject: Fix up the jbd patches slightly.
X-Git-Tag: v1_7_0_51~2^7~598
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=58b7abc6aa5ebe745628056388d045a66d26c69e;p=fs%2Flustre-release.git

Fix up the jbd patches slightly.
Add .pc files for the jbd patches.
---

diff --git a/lustre/kernel_patches/patches/jbd-ctx_switch.patch b/lustre/kernel_patches/patches/jbd-ctx_switch.patch
index 1b27c2d..8d4607f 100644
--- a/lustre/kernel_patches/patches/jbd-ctx_switch.patch
+++ b/lustre/kernel_patches/patches/jbd-ctx_switch.patch
@@ -1,4 +1,4 @@
-diff -rup linux-2.4.20-uml linux-2.4.21-rc2
+diff -rup linux-2.4.20-uml/fs/jbd/transaction.c linux-2.4.21-rc2/fs/jbd/transaction.c
 --- linux-2.4.20-uml/fs/jbd/transaction.c	Thu Nov 28 16:53:15 2002
 +++ linux-2.4.21-rc2/fs/jbd/transaction.c	Fri May 16 11:00:40 2003
 @@ -666,7 +673,8 @@ repeat:
diff --git a/lustre/kernel_patches/patches/jbd-flushtime.patch b/lustre/kernel_patches/patches/jbd-flushtime.patch
index 7e2fbd4..938c142 100644
--- a/lustre/kernel_patches/patches/jbd-flushtime.patch
+++ b/lustre/kernel_patches/patches/jbd-flushtime.patch
@@ -1,4 +1,4 @@
-diff -rup linux-2.4.20-uml linux-2.4.21-rc2
+diff -rup linux-2.4.20-uml/fs/jbd/transaction.c linux-2.4.21-rc2/fs/jbd/transaction.c
 --- linux-2.4.20-uml/fs/jbd/transaction.c	Thu Nov 28 16:53:15 2002
 +++ linux-2.4.21-rc2/fs/jbd/transaction.c	Fri May 16 11:00:40 2003
 @@ -1109,7 +1142,6 @@ int journal_dirty_metadata (handle_t *ha
diff --git a/lustre/kernel_patches/patches/jbd-get_write_access.patch b/lustre/kernel_patches/patches/jbd-get_write_access.patch
index 345a3f9..ea569dc 100644
--- a/lustre/kernel_patches/patches/jbd-get_write_access.patch
+++ b/lustre/kernel_patches/patches/jbd-get_write_access.patch
@@ -1,4 +1,4 @@
-diff -rup linux-2.4.20-uml linux-2.4.21-rc2
+diff -rup linux-2.4.20-uml/fs/jbd/transaction.c linux-2.4.21-rc2/fs/jbd/transaction.c
 --- linux-2.4.20-uml/fs/jbd/transaction.c	Thu Nov 28 16:53:15 2002
 +++ linux-2.4.21-rc2/fs/jbd/transaction.c	Fri May 16 11:00:40 2003
 @@ -735,7 +743,8 @@ done_locked:
@@ -11,7 +11,7 @@ diff -rup linux-2.4.20-uml linux-2.4.21-rc2
  		page = jh2bh(jh)->b_page;
  		offset = ((unsigned long) jh2bh(jh)->b_data) & ~PAGE_MASK;
  		source = kmap(page);
-diff -rup linux-2.4.20-uml linux-2.4.21-rc2
+diff -rup linux-2.4.20-uml/include/linux/jbd.h linux-2.4.21-rc2/include/linux/jbd.h
 --- linux-2.4.20-uml/include/linux/jbd.h	Mon Aug 25 16:16:57 2003
 +++ linux-2.4.21-rc2/include/linux/jbd.h	Tue May 13 13:28:29 2003
 @@ -40,6 +40,15 @@
diff --git a/lustre/kernel_patches/pc/jbd-ctx_switch.pc b/lustre/kernel_patches/pc/jbd-ctx_switch.pc
new file mode 100644
index 0000000..5f6cae2
--- /dev/null
+++ b/lustre/kernel_patches/pc/jbd-ctx_switch.pc
@@ -0,0 +1 @@
+fs/jbd/transaction.c
diff --git a/lustre/kernel_patches/pc/jbd-flushtime.pc b/lustre/kernel_patches/pc/jbd-flushtime.pc
new file mode 100644
index 0000000..5f6cae2
--- /dev/null
+++ b/lustre/kernel_patches/pc/jbd-flushtime.pc
@@ -0,0 +1 @@
+fs/jbd/transaction.c
diff --git a/lustre/kernel_patches/pc/jbd-get_write_access.pc b/lustre/kernel_patches/pc/jbd-get_write_access.pc
new file mode 100644
index 0000000..86e51d6
--- /dev/null
+++ b/lustre/kernel_patches/pc/jbd-get_write_access.pc
@@ -0,0 +1,2 @@
+fs/jbd/transaction.c
+include/linux/jbd.h