b=24037 Remove iopen ldiskfs patch for rhel5.

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-extents-2.6.18-vanilla.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
index e621461..0b5d110 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
@@ -2320,7 +2320,7 @@ Index: linux-2.6.18.8/fs/ext3/inode.c
 --- linux-2.6.18.8.orig/fs/ext3/inode.c        2007-07-17 09:18:12.000000000 +0200
 +++ linux-2.6.18.8/fs/ext3/inode.c     2007-07-17 11:08:11.000000000 +0200
 @@ -40,8 +40,6 @@
- #include "iopen.h"
+ #include "xattr.h"
  #include "acl.h"
  
 -static int ext3_writepage_trans_blocks(struct inode *inode);
@@ -2412,7 +2412,7 @@ Index: linux-2.6.18.8/fs/ext3/Makefile
 @@ -5,7 +5,7 @@
  obj-$(CONFIG_EXT3_FS) += ext3.o
  
- ext3-y        := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
+ ext3-y        := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 -         ioctl.o namei.o super.o symlink.o hash.o resize.o
 +         ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o
  
@@ -2737,9 +2737,9 @@ Index: linux-2.6.18.8/include/linux/ext3_fs.h
  
  /*
 @@ -373,6 +374,8 @@ struct ext3_inode {
+ #define EXT3_MOUNT_QUOTA              0x80000 /* Some quota option set */
+ #define EXT3_MOUNT_USRQUOTA           0x100000 /* "old" user quota */
  #define EXT3_MOUNT_GRPQUOTA           0x200000 /* "old" group quota */
- #define EXT3_MOUNT_IOPEN              0x400000        /* Allow access via iopen */
- #define EXT3_MOUNT_IOPEN_NOPRIV               0x800000/* Make iopen world-readable */
 +#define EXT3_MOUNT_EXTENTS            0x2000000/* Extents support */
 +#define EXT3_MOUNT_EXTDEBUG             0x4000000/* Extents debug */