b=3772

[fs/lustre-release.git] / lustre / kernel_patches / patches / iopen-2.6-suse.patch

diff --git a/lustre/kernel_patches/patches/iopen-2.6-suse.patch b/lustre/kernel_patches/patches/iopen-2.6-suse.patch
index 2133355..8a8d115 100644 (file)
--- a/lustre/kernel_patches/patches/iopen-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/iopen-2.6-suse.patch
@@ -8,8 +8,8 @@
 
 Index: linux-stage/fs/ext3/Makefile
 ===================================================================
---- linux-stage.orig/fs/ext3/Makefile  2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/Makefile       2004-05-07 16:00:17.000000000 -0400
+--- linux-stage.orig/fs/ext3/Makefile  2004-05-11 17:21:20.000000000 -0400
++++ linux-stage/fs/ext3/Makefile       2004-05-11 17:21:21.000000000 -0400
 @@ -4,7 +4,7 @@
  
  obj-$(CONFIG_EXT3_FS) += ext3.o
@@ -21,8 +21,8 @@ Index: linux-stage/fs/ext3/Makefile
  ext3-$(CONFIG_EXT3_FS_XATTR)   += xattr.o xattr_user.o xattr_trusted.o
 Index: linux-stage/fs/ext3/inode.c
 ===================================================================
---- linux-stage.orig/fs/ext3/inode.c   2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/inode.c        2004-05-07 17:21:59.000000000 -0400
+--- linux-stage.orig/fs/ext3/inode.c   2004-05-11 17:21:21.000000000 -0400
++++ linux-stage/fs/ext3/inode.c        2004-05-11 17:21:21.000000000 -0400
 @@ -37,6 +37,7 @@
  #include <linux/mpage.h>
  #include <linux/uio.h>
@@ -43,8 +43,8 @@ Index: linux-stage/fs/ext3/inode.c
        bh = iloc.bh;
 Index: linux-stage/fs/ext3/iopen.c
 ===================================================================
---- linux-stage.orig/fs/ext3/iopen.c   2004-05-07 16:00:17.000000000 -0400
-+++ linux-stage/fs/ext3/iopen.c        2004-05-07 17:22:37.000000000 -0400
+--- linux-stage.orig/fs/ext3/iopen.c   1969-12-31 19:00:00.000000000 -0500
++++ linux-stage/fs/ext3/iopen.c        2004-05-11 17:21:21.000000000 -0400
 @@ -0,0 +1,272 @@
 +/*
 + * linux/fs/ext3/iopen.c
@@ -320,8 +320,8 @@ Index: linux-stage/fs/ext3/iopen.c
 +}
 Index: linux-stage/fs/ext3/iopen.h
 ===================================================================
---- linux-stage.orig/fs/ext3/iopen.h   2004-05-07 16:00:17.000000000 -0400
-+++ linux-stage/fs/ext3/iopen.h        2004-05-07 16:00:17.000000000 -0400
+--- linux-stage.orig/fs/ext3/iopen.h   1969-12-31 19:00:00.000000000 -0500
++++ linux-stage/fs/ext3/iopen.h        2004-05-11 17:21:21.000000000 -0400
 @@ -0,0 +1,15 @@
 +/*
 + * iopen.h
@@ -340,8 +340,8 @@ Index: linux-stage/fs/ext3/iopen.h
 +                                         struct inode *inode, int rehash);
 Index: linux-stage/fs/ext3/namei.c
 ===================================================================
---- linux-stage.orig/fs/ext3/namei.c   2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/namei.c        2004-05-07 16:00:17.000000000 -0400
+--- linux-stage.orig/fs/ext3/namei.c   2004-05-11 17:21:20.000000000 -0400
++++ linux-stage/fs/ext3/namei.c        2004-05-11 17:21:21.000000000 -0400
 @@ -37,6 +37,7 @@
  #include <linux/buffer_head.h>
  #include <linux/smp_lock.h>
@@ -420,30 +420,30 @@ Index: linux-stage/fs/ext3/namei.c
  }
 Index: linux-stage/fs/ext3/super.c
 ===================================================================
---- linux-stage.orig/fs/ext3/super.c   2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/super.c        2004-05-07 17:21:59.000000000 -0400
+--- linux-stage.orig/fs/ext3/super.c   2004-05-11 17:21:21.000000000 -0400
++++ linux-stage/fs/ext3/super.c        2004-05-11 17:44:53.000000000 -0400
 @@ -536,7 +536,7 @@
        Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_noload,
        Opt_commit, Opt_journal_update, Opt_journal_inum,
        Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
--      Opt_ignore, Opt_err,
-+      Opt_ignore, Opt_err, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+-      Opt_ignore, Opt_barrier,
++      Opt_ignore, Opt_barrier, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+       Opt_err,
  };
  
- static match_table_t tokens = {
-@@ -575,6 +575,9 @@
-       {Opt_ignore, "noquota"},
+@@ -577,6 +577,9 @@
        {Opt_ignore, "quota"},
        {Opt_ignore, "usrquota"},
-+      {Opt_iopen,  "iopen"},
-+      {Opt_noiopen,  "noiopen"},
-+      {Opt_iopen_nopriv,  "iopen_nopriv"},
+       {Opt_barrier, "barrier=%u"},
++      {Opt_iopen, "iopen"},
++      {Opt_noiopen, "noiopen"},
++      {Opt_iopen_nopriv, "iopen_nopriv"},
        {Opt_err, NULL}
  };
  
-@@ -762,6 +765,18 @@
-               case Opt_abort:
-                       set_opt(sbi->s_mount_opt, ABORT);
+@@ -772,6 +775,18 @@
+                       else
+                               clear_opt(sbi->s_mount_opt, BARRIER);
                        break;
 +              case Opt_iopen:
 +                      set_opt (sbi->s_mount_opt, IOPEN);
@@ -462,14 +462,14 @@ Index: linux-stage/fs/ext3/super.c
                default:
 Index: linux-stage/include/linux/ext3_fs.h
 ===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h   2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/include/linux/ext3_fs.h        2004-05-07 16:00:17.000000000 -0400
-@@ -325,6 +325,8 @@
- #define EXT3_MOUNT_NO_UID32           0x2000  /* Disable 32-bit UIDs */
+--- linux-stage.orig/include/linux/ext3_fs.h   2004-05-11 17:21:20.000000000 -0400
++++ linux-stage/include/linux/ext3_fs.h        2004-05-11 17:21:21.000000000 -0400
+@@ -326,6 +326,8 @@
  #define EXT3_MOUNT_XATTR_USER         0x4000  /* Extended user attributes */
  #define EXT3_MOUNT_POSIX_ACL          0x8000  /* POSIX Access Control Lists */
-+#define EXT3_MOUNT_IOPEN             0x10000  /* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV              0x20000  /* Make iopen world-readable */
+ #define EXT3_MOUNT_BARRIER            0x10000 /* Use block barriers */
++#define EXT3_MOUNT_IOPEN                0x20000 /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV         0x40000 /* Make iopen world-readable */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
  #ifndef _LINUX_EXT2_FS_H