Whamcloud - gitweb
LU-20 remove unnecessary DMU export patch
authorAndreas Dilger <adilger@whamcloud.com>
Wed, 13 Jul 2011 03:41:39 +0000 (21:41 -0600)
committerOleg Drokin <green@whamcloud.com>
Fri, 29 Jul 2011 00:43:08 +0000 (20:43 -0400)
The patch for kernel symbol export for DMU back-ends was added to
facilitate upgrading servers.  However, the upstream ZFS code will
no longer be working on RHEL5 kernels, so this patch is not needed.

Change-Id: Icf443a366fd51c06cb5d02df27b7e70f476fcb63
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/1086
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Tested-by: Hudson
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
lustre/kernel_patches/patches/export-symbols-for-dmu.patch [deleted file]
lustre/kernel_patches/series/2.6-rhel5.series

diff --git a/lustre/kernel_patches/patches/export-symbols-for-dmu.patch b/lustre/kernel_patches/patches/export-symbols-for-dmu.patch
deleted file mode 100644 (file)
index 7087004..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -rupN linux-2.6.18-164.6.1_a/fs/proc/mmu.c linux-2.6.18-164.6.1_b/fs/proc/mmu.c
---- linux-2.6.18-164.6.1_a/fs/proc/mmu.c       2010-07-20 12:15:18.000000000 +0530
-+++ linux-2.6.18-164.6.1_b/fs/proc/mmu.c       2010-07-20 12:31:06.000000000 +0530
-@@ -75,3 +75,4 @@ void get_vmalloc_info(struct vmalloc_inf
-               read_unlock(&vmlist_lock);
-       }
- }
-+EXPORT_SYMBOL(get_vmalloc_info);
-diff -rupN linux-2.6.18-164.6.1_a/kernel/sched.c linux-2.6.18-164.6.1_b/kernel/sched.c
---- linux-2.6.18-164.6.1_a/kernel/sched.c      2010-07-20 12:19:16.000000000 +0530
-+++ linux-2.6.18-164.6.1_b/kernel/sched.c      2010-07-20 12:32:05.000000000 +0530
-@@ -1037,10 +1037,11 @@ static inline void resched_task(struct t
-  * task_curr - is this task currently executing on a CPU?
-  * @p: the task in question.
-  */
--inline int task_curr(const struct task_struct *p)
-+int task_curr(const struct task_struct *p)
- {
-       return cpu_curr(task_cpu(p)) == p;
- }
-+EXPORT_SYMBOL(task_curr);
- /* Used instead of source_load when we know the type == 0 */
- unsigned long weighted_cpuload(const int cpu)
-
index 5584beb..ab6686b 100644 (file)
@@ -25,6 +25,5 @@ prune-icache-use-trylock-rhel5.patch
 jbd2-jcberr-2.6-rhel5.patch
 jbd2-commit-timer-no-jiffies-rounding.diff
 md-avoid-bug_on-when-bmc-overflow.patch
-export-symbols-for-dmu.patch
 jbd2_stats_proc_init-wrong-place.patch
 lustre_iser_max_sectors_tuning_lustre2.0.patch