fix a cut-n-paste error in previous commit

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 816925a..cf341fb 100644 (file)
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -33,6 +33,7 @@
 #include <linux/lvfs_linux.h>
 #else
 struct group_info { /* unused */ };
+#include <liblustre.h>
 #endif
 
 #define LLOG_LVFS

diff --git a/lustre/kernel_patches/patches/ext3-iam-separate.patch b/lustre/kernel_patches/patches/ext3-iam-separate.patch
index 1d05ccd..d2e770b 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-iam-separate.patch
+++ b/lustre/kernel_patches/patches/ext3-iam-separate.patch
@@ -1,7 +1,7 @@
 Index: iam/fs/ext3/Makefile
 ===================================================================
 --- iam.orig/fs/ext3/Makefile  2006-05-31 20:24:32.000000000 +0400
-+++ iam/fs/ext3/Makefile       2006-08-24 20:43:40.000000000 +0400
++++ iam/fs/ext3/Makefile       2006-08-24 22:50:57.000000000 +0400
 @@ -6,7 +6,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 \
@@ -2689,8 +2689,8 @@ Index: iam/fs/ext3/iam_lfix.c
 Index: iam/fs/ext3/iam_lvar.c
 ===================================================================
 --- iam.orig/fs/ext3/iam_lvar.c        2004-04-06 17:27:52.000000000 +0400
-+++ iam/fs/ext3/iam_lvar.c     2006-08-24 20:39:50.000000000 +0400
-@@ -0,0 +1,881 @@
++++ iam/fs/ext3/iam_lvar.c     2006-08-24 22:50:55.000000000 +0400
+@@ -0,0 +1,882 @@
 +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
 + * vim:expandtab:shiftwidth=8:tabstop=8:
 + *
@@ -3414,7 +3414,7 @@ Index: iam/fs/ext3/iam_lvar.c
 +
 +static int lvar_root_limit(int blocksize, int size)
 +{
-+        return root_limit(sizeof(struct iam_lfix_root), blocksize, size);
++        return root_limit(sizeof(struct lvar_root), blocksize, size);
 +}
 +
 +static void lvar_root(void *buf,
@@ -3440,7 +3440,8 @@ Index: iam/fs/ext3/iam_lvar.c
 +                 * limit itself + one pointer to the leaf.
 +                 */
 +                .count = cpu_to_le16(2),
-+                .limit = lvar_root_limit(blocksize, keysize + ptrsize)
++                .limit = lvar_root_limit(blocksize,
++                                         sizeof (lvar_hash_t) + ptrsize)
 +        };
 +
 +        entry = root + 1;
@@ -5574,7 +5575,7 @@ Index: iam/fs/ext3/namei.c
 Index: iam/include/linux/lustre_iam.h
 ===================================================================
 --- iam.orig/include/linux/lustre_iam.h        2006-05-31 20:24:32.000000000 +0400
-+++ iam/include/linux/lustre_iam.h     2006-08-24 20:43:40.000000000 +0400
++++ iam/include/linux/lustre_iam.h     2006-08-24 22:50:57.000000000 +0400
 @@ -1,9 +1,68 @@
 +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
 + * vim:expandtab:shiftwidth=8:tabstop=8:

diff --git a/lustre/kernel_patches/patches/ext3-iam-uapi.patch b/lustre/kernel_patches/patches/ext3-iam-uapi.patch
index 9abe3f1..cd74ccb 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-iam-uapi.patch
+++ b/lustre/kernel_patches/patches/ext3-iam-uapi.patch
@@ -1,7 +1,7 @@
 Index: iam/fs/ext3/Makefile
 ===================================================================
---- iam.orig/fs/ext3/Makefile  2006-08-24 01:37:35.000000000 +0400
-+++ iam/fs/ext3/Makefile       2006-08-24 01:37:35.000000000 +0400
+--- iam.orig/fs/ext3/Makefile  2006-08-24 22:50:57.000000000 +0400
++++ iam/fs/ext3/Makefile       2006-08-24 22:50:58.000000000 +0400
 @@ -6,7 +6,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 \
@@ -13,8 +13,8 @@ Index: iam/fs/ext3/Makefile
  ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
 Index: iam/fs/ext3/dir.c
 ===================================================================
---- iam.orig/fs/ext3/dir.c     2006-08-24 01:37:35.000000000 +0400
-+++ iam/fs/ext3/dir.c  2006-08-24 01:37:35.000000000 +0400
+--- iam.orig/fs/ext3/dir.c     2006-08-24 22:50:57.000000000 +0400
++++ iam/fs/ext3/dir.c  2006-08-24 22:50:58.000000000 +0400
 @@ -28,6 +28,7 @@
  #include <linux/smp_lock.h>
  #include <linux/slab.h>
@@ -112,8 +112,8 @@ Index: iam/fs/ext3/dir.c
                    (filp->f_version != inode->i_version)) {
 Index: iam/fs/ext3/file.c
 ===================================================================
---- iam.orig/fs/ext3/file.c    2006-08-24 01:37:35.000000000 +0400
-+++ iam/fs/ext3/file.c 2006-08-24 01:37:35.000000000 +0400
+--- iam.orig/fs/ext3/file.c    2006-08-24 22:50:57.000000000 +0400
++++ iam/fs/ext3/file.c 2006-08-24 22:50:58.000000000 +0400
 @@ -23,6 +23,7 @@
  #include <linux/jbd.h>
  #include <linux/ext3_fs.h>
@@ -156,7 +156,7 @@ Index: iam/fs/ext3/file.c
 Index: iam/fs/ext3/iam-uapi.c
 ===================================================================
 --- iam.orig/fs/ext3/iam-uapi.c        2004-04-06 17:27:52.000000000 +0400
-+++ iam/fs/ext3/iam-uapi.c     2006-08-24 01:37:35.000000000 +0400
++++ iam/fs/ext3/iam-uapi.c     2006-08-24 22:50:58.000000000 +0400
 @@ -0,0 +1,361 @@
 +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
 + * vim:expandtab:shiftwidth=8:tabstop=8:
@@ -521,8 +521,8 @@ Index: iam/fs/ext3/iam-uapi.c
 +}
 Index: iam/fs/ext3/ioctl.c
 ===================================================================
---- iam.orig/fs/ext3/ioctl.c   2006-08-24 01:37:35.000000000 +0400
-+++ iam/fs/ext3/ioctl.c        2006-08-24 01:37:35.000000000 +0400
+--- iam.orig/fs/ext3/ioctl.c   2006-08-24 22:50:57.000000000 +0400
++++ iam/fs/ext3/ioctl.c        2006-08-24 22:50:58.000000000 +0400
 @@ -250,6 +250,6 @@ flags_err:
  
  
@@ -533,8 +533,8 @@ Index: iam/fs/ext3/ioctl.c
  }
 Index: iam/include/linux/lustre_iam.h
 ===================================================================
---- iam.orig/include/linux/lustre_iam.h        2006-08-24 01:37:35.000000000 +0400
-+++ iam/include/linux/lustre_iam.h     2006-08-24 01:37:35.000000000 +0400
+--- iam.orig/include/linux/lustre_iam.h        2006-08-24 22:50:57.000000000 +0400
++++ iam/include/linux/lustre_iam.h     2006-08-24 22:50:58.000000000 +0400
 @@ -30,9 +30,6 @@
  #ifndef __LINUX_LUSTRE_IAM_H__
  #define __LINUX_LUSTRE_IAM_H__