Fix bug in HP kernel with calling sync_fs() under the superblock lock.

b=2681

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 75cad90..274a565 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -58,6 +58,7 @@
        - disable VM readahead to avoid reading outside lock extents (2805)
        * miscellania
        - return LL_SUPER_MAGIC from statfs for the filesystem type (1972)
+       - updated kernel patches for hp-2.4.20 kernel (2681)
 
 2004-02-07  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.0.4

diff --git a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch
index d722b68..abf3d57 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch
+++ b/lustre/kernel_patches/patches/ext3-delete_thread-2.4.20-hp.patch
@@ -437,6 +437,22 @@ Index: linux/fs/ext3/file.c
        setattr:        ext3_setattr,           /* BKL held */
        setxattr:       ext3_setxattr,          /* BKL held */
        getxattr:       ext3_getxattr,          /* BKL held */
+Index: linux/fs/buffer.c
+===================================================================
+--- linux.orig/fs/buffer.c     Mon Feb  2 20:57:35 2004
++++ linux/fs/buffer.c  Mon Feb  2 20:58:05 2004
+@@ -373,9 +373,9 @@
+       lock_super(sb);
+       if (sb->s_dirt && sb->s_op && sb->s_op->write_super)
+               sb->s_op->write_super(sb);
+-      if (sb->s_op && sb->s_op->sync_fs)
+-              sb->s_op->sync_fs(sb);
+       unlock_super(sb);
++      if (sb->s_op && sb->s_op->sync_fs)
++              sb->s_op->sync_fs(sb);
+       unlock_kernel();
+ 
+       return sync_buffers(dev, 1);
 Index: linux/include/linux/ext3_fs.h
 ===================================================================
 --- linux.orig/include/linux/ext3_fs.h Mon Feb  2 20:57:35 2004