b=3772

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-raw-lookup-pdirops.patch

diff --git a/lustre/kernel_patches/patches/ext3-raw-lookup-pdirops.patch b/lustre/kernel_patches/patches/ext3-raw-lookup-pdirops.patch
index 72a5156..3d4235b 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-raw-lookup-pdirops.patch
+++ b/lustre/kernel_patches/patches/ext3-raw-lookup-pdirops.patch
@@ -2,20 +2,24 @@
  include/linux/fs.h |    1 +
  2 files changed, 32 insertions(+)
 
---- linux-2.4.18-p4smp1Guser/include/linux/fs.h~ext3-raw-lookup        Thu Sep 25 15:59:59 2003
-+++ linux-2.4.18-p4smp1Guser-pschwan/include/linux/fs.h        Thu Sep 25 15:59:59 2003
-@@ -911,6 +911,7 @@ struct inode_operations {
+Index: lum/include/linux/fs.h
+===================================================================
+--- lum.orig/include/linux/fs.h        2004-06-07 17:52:41.000000000 -0400
++++ lum/include/linux/fs.h     2004-06-07 17:56:55.000000000 -0400
+@@ -904,6 +904,7 @@
        int (*create) (struct inode *,struct dentry *,int);
        int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *);
        struct dentry * (*lookup) (struct inode *,struct dentry *);
 +      int (*lookup_raw) (struct inode *, const char *, int, ino_t *);
-       struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct lookup_intent *, int flags);
+       struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct nameidata *, struct lookup_intent *, int flags);
        int (*link) (struct dentry *,struct inode *,struct dentry *);
        int (*link_raw) (struct nameidata *,struct nameidata *);
---- linux-2.4.18-p4smp1Guser/fs/ext3/namei.c~ext3-raw-lookup   Thu Sep 25 15:59:59 2003
-+++ linux-2.4.18-p4smp1Guser-pschwan/fs/ext3/namei.c   Thu Sep 25 16:16:48 2003
-@@ -1121,6 +1121,36 @@ static struct dentry *ext3_lookup(struct
-       return NULL;
+Index: lum/fs/ext3/namei.c
+===================================================================
+--- lum.orig/fs/ext3/namei.c   2004-06-07 17:52:41.000000000 -0400
++++ lum/fs/ext3/namei.c        2004-06-07 17:56:31.000000000 -0400
+@@ -1128,6 +1128,36 @@
+       return iopen_connect_dentry(dentry, inode, 1);
  }
  
 +static int ext3_lookup_raw(struct inode *dir, const char *name,
@@ -51,7 +55,7 @@
  #define S_SHIFT 12
  static unsigned char ext3_type_by_mode[S_IFMT >> S_SHIFT] = {
        [S_IFREG >> S_SHIFT]    EXT3_FT_REG_FILE,
-@@ -2623,6 +2653,7 @@ static inline void ext3_unlock_htree(str
+@@ -2772,6 +2802,7 @@
  struct inode_operations ext3_dir_inode_operations = {
        create:         ext3_create,            /* BKL held */
        lookup:         ext3_lookup,            /* BKL held */
@@ -59,5 +63,3 @@
        link:           ext3_link,              /* BKL held */
        unlink:         ext3_unlink,            /* BKL held */
        symlink:        ext3_symlink,           /* BKL held */
-
-_