- landing of b_hd_cleanup_merge to HEAD.

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

diff --git a/lustre/kernel_patches/patches/export_symbols-2.6-suse.patch b/lustre/kernel_patches/patches/export_symbols-2.6-suse.patch
index b22d925..e8e1740 100644 (file)
--- a/lustre/kernel_patches/patches/export_symbols-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/export_symbols-2.6-suse.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.4-51.0/fs/filesystems.c
+Index: linux-2.6.7/fs/filesystems.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/filesystems.c     2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/filesystems.c  2004-04-15 14:59:56.000000000 -0400
+--- linux-2.6.7.orig/fs/filesystems.c  2004-06-16 13:19:51.000000000 +0800
++++ linux-2.6.7/fs/filesystems.c       2004-09-06 21:01:57.000000000 +0800
 @@ -27,7 +27,9 @@
   */
  
@@ -13,11 +13,33 @@ Index: linux-2.6.4-51.0/fs/filesystems.c
  
  /* WARNING: This can be used only if we _already_ own a reference */
  void get_filesystem(struct file_system_type *fs)
-Index: linux-2.6.4-51.0/include/linux/fs.h
+Index: linux-2.6.7/fs/namespace.c
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/fs.h   2004-04-15 14:59:50.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/fs.h        2004-04-15 14:59:56.000000000 -0400
-@@ -1432,6 +1432,7 @@
+--- linux-2.6.7.orig/fs/namespace.c    2004-09-06 21:00:27.000000000 +0800
++++ linux-2.6.7/fs/namespace.c 2004-09-06 21:01:57.000000000 +0800
+@@ -364,7 +364,7 @@
+       }
+ }
+ 
+-static int do_umount(struct vfsmount *mnt, int flags)
++int do_umount(struct vfsmount *mnt, int flags)
+ {
+       struct super_block * sb = mnt->mnt_sb;
+       int retval;
+@@ -439,7 +439,7 @@
+       up_write(&current->namespace->sem);
+       return retval;
+ }
+-
++EXPORT_SYMBOL(do_umount);
+ /*
+  * Now umount can handle mount points as well as block devices.
+  * This is important for filesystems which use unnamed block devices.
+Index: linux-2.6.7/include/linux/fs.h
+===================================================================
+--- linux-2.6.7.orig/include/linux/fs.h        2004-08-30 19:31:13.000000000 +0800
++++ linux-2.6.7/include/linux/fs.h     2004-09-06 21:01:57.000000000 +0800
+@@ -1474,6 +1474,7 @@
  
  extern struct file_operations generic_ro_fops;
  
@@ -25,10 +47,10 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
  
  extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
-Index: linux-2.6.4-51.0/include/linux/ext2_fs_sb.h
+Index: linux-2.6.7/include/linux/ext2_fs_sb.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/ext2_fs_sb.h   2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/ext2_fs_sb.h        2004-04-15 14:59:56.000000000 -0400
+--- linux-2.6.7.orig/include/linux/ext2_fs_sb.h        2004-06-16 13:19:53.000000000 +0800
++++ linux-2.6.7/include/linux/ext2_fs_sb.h     2004-09-06 21:01:57.000000000 +0800
 @@ -16,9 +16,11 @@
  #ifndef _LINUX_EXT2_FS_SB
  #define _LINUX_EXT2_FS_SB
@@ -42,11 +64,23 @@ Index: linux-2.6.4-51.0/include/linux/ext2_fs_sb.h
  /*
   * second extended-fs super-block data in memory
   */
-Index: linux-2.6.4-51.0/kernel/kallsyms.c
+Index: linux-2.6.7/include/linux/mount.h
+===================================================================
+--- linux-2.6.7.orig/include/linux/mount.h     2004-09-06 21:01:55.000000000 +0800
++++ linux-2.6.7/include/linux/mount.h  2004-09-06 21:02:26.000000000 +0800
+@@ -56,6 +56,7 @@
+ extern struct vfsmount *alloc_vfsmnt(const char *name);
+ extern struct vfsmount *do_kern_mount(const char *fstype, int flags,
+                                     const char *name, void *data);
++extern int do_umount(struct vfsmount *mnt, int flags);
+ extern spinlock_t vfsmount_lock;
+ 
+ #endif
+Index: linux-2.6.7/kernel/kallsyms.c
 ===================================================================
---- linux-2.6.4-51.0.orig/kernel/kallsyms.c    2004-04-05 12:42:08.000000000 -0400
-+++ linux-2.6.4-51.0/kernel/kallsyms.c 2004-04-15 15:00:56.000000000 -0400
-@@ -329,3 +329,4 @@
+--- linux-2.6.7.orig/kernel/kallsyms.c 2004-06-16 13:20:19.000000000 +0800
++++ linux-2.6.7/kernel/kallsyms.c      2004-09-06 21:01:57.000000000 +0800
+@@ -322,3 +322,4 @@
  
  EXPORT_SYMBOL(kallsyms_lookup);
  EXPORT_SYMBOL(__print_symbol);