land b1_5 onto HEAD

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-include-fixes-2.6-rhel4.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch
new file mode 100644 (file)
index 0000000..52e5521
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch
@@ -0,0 +1,20 @@
+Index: linux-stage/include/linux/ext3_fs.h
+===================================================================
+--- linux-stage.orig/include/linux/ext3_fs.h   2005-02-25 14:53:56.424908168 +0200
++++ linux-stage/include/linux/ext3_fs.h        2005-02-25 14:53:59.376459464 +0200
+@@ -361,12 +361,13 @@
+ #define EXT3_MOUNT_IOPEN_NOPRIV               0x100000/* Make iopen world-readable */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+-#ifndef _LINUX_EXT2_FS_H
++#ifndef clear_opt
+ #define clear_opt(o, opt)             o &= ~EXT3_MOUNT_##opt
+ #define set_opt(o, opt)                       o |= EXT3_MOUNT_##opt
+ #define test_opt(sb, opt)             (EXT3_SB(sb)->s_mount_opt & \
+                                        EXT3_MOUNT_##opt)
+-#else
++#endif
++#ifndef EXT2_MOUNT_NOLOAD
+ #define EXT2_MOUNT_NOLOAD             EXT3_MOUNT_NOLOAD
+ #define EXT2_MOUNT_ABORT              EXT3_MOUNT_ABORT
+ #define EXT2_MOUNT_DATA_FLAGS         EXT3_MOUNT_DATA_FLAGS