- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

[fs/lustre-release.git] / lustre / kernel_patches / patches / exports_2.4.20-rh-hp.patch

diff --git a/lustre/kernel_patches/patches/exports_hp.patch b/lustre/kernel_patches/patches/exports_2.4.20-rh-hp.patch
similarity index 61%
rename from lustre/kernel_patches/patches/exports_hp.patch
rename to lustre/kernel_patches/patches/exports_2.4.20-rh-hp.patch
index 0222b46..feaeec6 100644 (file)
--- a/lustre/kernel_patches/patches/exports_hp.patch
+++ b/lustre/kernel_patches/patches/exports_2.4.20-rh-hp.patch
@@ -1,26 +1,23 @@
-
-
-
  fs/ext3/Makefile   |    2 ++
  fs/ext3/super.c    |    2 +-
  include/linux/fs.h |    1 +
  kernel/ksyms.c     |    4 ++++
- 4 files changed, 9 insertions(+), 1 deletion(-)
+ 4 files changed, 8 insertions(+), 1 deletion(-)
 
---- linux-2.4.19-hp2_pnnl2/fs/ext3/Makefile~exports    Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/Makefile       Sun Jan 19 18:52:38 2003
+--- linux/fs/ext3/Makefile~exports_2.4.20      Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/fs/ext3/Makefile     Wed Apr  9 10:19:53 2003
 @@ -9,6 +9,8 @@
  
  O_TARGET := ext3.o
  
-+export-objs :=        super.o
++export-objs :=        super.o inode.o
 +
  obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
                ioctl.o namei.o super.o symlink.o
  obj-m    := $(O_TARGET)
---- linux-2.4.19-hp2_pnnl2/fs/ext3/super.c~exports     Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/super.c        Sun Jan 19 18:52:38 2003
-@@ -1744,7 +1744,7 @@ static void __exit exit_ext3_fs(void)
+--- linux/fs/ext3/super.c~exports_2.4.20       Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/fs/ext3/super.c      Wed Apr  9 10:19:53 2003
+@@ -1769,7 +1769,7 @@ static void __exit exit_ext3_fs(void)
        unregister_filesystem(&ext3_fs_type);
  }
  
@@ -29,18 +26,18 @@
  
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
---- linux-2.4.19-hp2_pnnl2/include/linux/fs.h~exports  Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/include/linux/fs.h     Sun Jan 19 18:52:38 2003
+--- linux/include/linux/fs.h~exports_2.4.20    Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/include/linux/fs.h   Wed Apr  9 10:19:53 2003
 @@ -1020,6 +1020,7 @@ extern int unregister_filesystem(struct 
  extern struct vfsmount *kern_mount(struct file_system_type *);
  extern int may_umount(struct vfsmount *);
  extern long do_mount(char *, char *, char *, unsigned long, void *);
 +struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data);
- extern void umount_tree(struct vfsmount *);
  
  #define kern_umount mntput
---- linux-2.4.19-hp2_pnnl2/kernel/ksyms.c~exports      Sun Jan 19 18:52:38 2003
-+++ linux-2.4.19-hp2_pnnl2-root/kernel/ksyms.c Sun Jan 19 18:52:38 2003
+ 
+--- linux/kernel/ksyms.c~exports_2.4.20        Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/kernel/ksyms.c       Wed Apr  9 10:19:53 2003
 @@ -308,6 +308,10 @@ EXPORT_SYMBOL(dcache_dir_fsync);
  EXPORT_SYMBOL(dcache_readdir);
  EXPORT_SYMBOL(dcache_dir_ops);