From: scjody Date: Fri, 12 Oct 2007 04:01:41 +0000 (+0000) Subject: Branch HEAD X-Git-Tag: v1_7_0_51~631 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=2e68b981217248e9ba2f477814b02e3f6c79167e Branch HEAD Remove client patches from SLES 10 kernel. This causes SLES 10 clients to behave as patchless clients even on a Lustre-patched (server) kernel. b=12411 i=adilger i=nathan --- diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 479eb5b..799f0c8 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,6 +12,11 @@ * Recommended e2fsprogs version: 1.40.2-cfs1 * Note that reiserfs quotas are disabled on SLES 10 in this kernel. +Bugzilla : 12411 +Description: Remove client patches from SLES 10 kernel. +Details : This causes SLES 10 clients to behave as patchless clients + even on a Lustre-patched (server) kernel. + Severity : enhancement Bugzilla : 2262 Description: self-adjustable client's lru lists diff --git a/lustre/kernel_patches/patches/iopen-misc-2.6.12.patch b/lustre/kernel_patches/patches/iopen-misc-2.6.12.patch index 48d8ab9..c5d3c54 100644 --- a/lustre/kernel_patches/patches/iopen-misc-2.6.12.patch +++ b/lustre/kernel_patches/patches/iopen-misc-2.6.12.patch @@ -1,10 +1,10 @@ -Index: linux-2.6.4-51.0/Documentation/filesystems/ext2.txt +Index: linux-2.6.16.46-0.14/Documentation/filesystems/ext2.txt =================================================================== ---- linux-2.6.4-51.0.orig/Documentation/filesystems/ext2.txt 2004-05-06 22:21:26.000000000 -0400 -+++ linux-2.6.4-51.0/Documentation/filesystems/ext2.txt 2004-05-06 22:24:42.000000000 -0400 -@@ -35,6 +35,22 @@ +--- linux-2.6.16.46-0.14.orig/Documentation/filesystems/ext2.txt ++++ linux-2.6.16.46-0.14/Documentation/filesystems/ext2.txt +@@ -58,6 +58,22 @@ nobh Do not attach buffer_heads to fi - sb=n Use alternate superblock at this location. + xip Use execute in place (no caching) if possible +iopen Makes an invisible pseudo-directory called + __iopen__ available in the root directory @@ -25,11 +25,41 @@ Index: linux-2.6.4-51.0/Documentation/filesystems/ext2.txt grpquota,noquota,quota,usrquota Quota options are silently ignored by ext2. -Index: linux-2.6.4-51.0/fs/dcache.c +Index: linux-2.6.16.46-0.14/fs/dcache.c =================================================================== ---- linux-2.6.4-51.0.orig/fs/dcache.c 2004-05-06 22:24:42.000000000 -0400 -+++ linux-2.6.4-51.0/fs/dcache.c 2004-05-06 22:58:37.000000000 -0400 -@@ -1195,14 +1195,13 @@ +--- linux-2.6.16.46-0.14.orig/fs/dcache.c ++++ linux-2.6.16.46-0.14/fs/dcache.c +@@ -1309,17 +1309,26 @@ static void __d_rehash(struct dentry * e + * Adds a dentry to the hash according to its name. + */ + +-void d_rehash(struct dentry * entry) ++void d_rehash_cond(struct dentry * entry, int lock) + { + struct hlist_head *list = d_hash(entry->d_parent, entry->d_name.hash); + +- spin_lock(&dcache_lock); ++ if (lock) ++ spin_lock(&dcache_lock); + spin_lock(&entry->d_lock); + __d_rehash(entry, list); + spin_unlock(&entry->d_lock); +- spin_unlock(&dcache_lock); ++ if (lock) ++ spin_unlock(&dcache_lock); + } + ++EXPORT_SYMBOL(d_rehash_cond); ++ ++void d_rehash(struct dentry * entry) ++{ ++ d_rehash_cond(entry, 1); ++ } ++ + #define do_switch(x,y) do { \ + __typeof__ (x) __tmp = x; \ + x = y; y = __tmp; } while (0) +@@ -1392,14 +1401,13 @@ static void switch_names(struct dentry * * dcache entries should not be moved in this way. */ @@ -45,8 +75,8 @@ Index: linux-2.6.4-51.0/fs/dcache.c write_seqlock(&rename_lock); /* * XXXX: do we really need to take target->d_lock? -@@ -1253,6 +1252,14 @@ - spin_unlock(&target->d_lock); +@@ -1450,6 +1458,14 @@ already_unhashed: + fsnotify_d_move(dentry); spin_unlock(&dentry->d_lock); write_sequnlock(&rename_lock); +} @@ -60,11 +90,11 @@ Index: linux-2.6.4-51.0/fs/dcache.c spin_unlock(&dcache_lock); } -Index: linux-2.6.4-51.0/include/linux/dcache.h +Index: linux-2.6.16.46-0.14/include/linux/dcache.h =================================================================== ---- linux-2.6.4-51.0.orig/include/linux/dcache.h 2004-05-06 22:24:42.000000000 -0400 -+++ linux-2.6.4-51.0/include/linux/dcache.h 2004-05-06 23:03:43.000000000 -0400 -@@ -234,6 +234,7 @@ +--- linux-2.6.16.46-0.14.orig/include/linux/dcache.h ++++ linux-2.6.16.46-0.14/include/linux/dcache.h +@@ -236,6 +236,7 @@ extern int have_submounts(struct dentry * This adds the entry to the hash queues. */ extern void d_rehash(struct dentry *); @@ -72,7 +102,7 @@ Index: linux-2.6.4-51.0/include/linux/dcache.h /** * d_add - add dentry to hash queues -@@ -252,6 +253,7 @@ +@@ -271,6 +272,7 @@ static inline struct dentry *d_add_uniqu /* used for rename() and baskets */ extern void d_move(struct dentry *, struct dentry *); diff --git a/lustre/kernel_patches/series/2.6-sles10.series b/lustre/kernel_patches/series/2.6-sles10.series index 9c5a4c4..729d743 100644 --- a/lustre/kernel_patches/series/2.6-sles10.series +++ b/lustre/kernel_patches/series/2.6-sles10.series @@ -1,17 +1,13 @@ lustre_version.patch -vfs_intent-2.6-sles10.patch -vfs_races-2.6.18-vanilla.patch ext3-wantedi-misc-2.6-suse.patch jbd-2.6.10-jcberr.patch iopen-misc-2.6.12.patch -export-truncate-2.6-suse.patch export_symbols-2.6.12.patch dev_read_only-2.6-fc5.patch export-2.6-fc5.patch -lookup_bdev_init_intent.patch -remove-suid-2.6-suse.patch export-show_task-2.6-fc5.patch sd_iostats-2.6-rhel4.patch export_symbol_numa-2.6-fc5.patch blkdev_tunables-2.6-sles10.patch jbd-stats-2.6-sles10.patch +i_filter_data.patch