Updated 2.4.17 obd kernel patch.

diff --git a/lustre/patches/patch-2.4.17 b/lustre/patches/patch-2.4.17
index 2f249f0..3c24fc0 100644 (file)
--- a/lustre/patches/patch-2.4.17
+++ b/lustre/patches/patch-2.4.17
@@ -1,32 +1,35 @@
---- linux/mm/filemap.c.obd-orig        Mon Nov 26 06:29:17 2001
-+++ linux/mm/filemap.c Tue Dec 11 14:29:50 2001
-@@ -2862,8 +2861,10 @@
-       if ((ssize_t) count < 0)
-               return -EINVAL;
+diff -u -r linux-2.4.17-stock/include/linux/fs.h linux-2.4.17/include/linux/fs.h
+--- linux-2.4.17-stock/include/linux/fs.h      Fri Dec 21 09:42:03 2001
++++ linux-2.4.17/include/linux/fs.h    Wed Feb 20 13:39:51 2002
+@@ -984,6 +984,8 @@
+ extern int may_umount(struct vfsmount *);
+ extern long do_mount(char *, char *, char *, unsigned long, void *);
  
-+#if 0
-       if (!access_ok(VERIFY_READ, buf, count))
-               return -EFAULT;
-+#endif
++struct vfsmount *do_kern_mount(char *type, int flags, char *name, void *data);
++int do_umount(struct vfsmount *mnt, int flags);
+ #define kern_umount mntput
  
-       cached_page = NULL;
+ extern int vfs_statfs(struct super_block *, struct statfs *);
+@@ -1042,6 +1044,15 @@
+               return __get_lease(inode, mode);
+       return 0;
+ }
++
++/* fs/namei.c */ 
++asmlinkage long sys_mkdir(const char * pathname, int mode);
++asmlinkage long sys_rmdir(const char * pathname);
++asmlinkage long sys_unlink(const char * pathname);
++asmlinkage long sys_open(const char * filename, int flags, int mode);
++asmlinkage long sys_fstat64(unsigned long fd, struct stat64 * statbuf, long flags);
++asmlinkage ssize_t sys_read(unsigned int fd, char * buf, size_t count);
++asmlinkage ssize_t sys_write(unsigned int fd, const char * buf, size_t count);
  
-@@ -2987,10 +2988,12 @@
-                * same page as we're writing to, without it being marked
-                * up-to-date.
-                */
-+#if 0
-               { volatile unsigned char dummy;
-                       __get_user(dummy, buf);
-                       __get_user(dummy, buf+bytes-1);
-               }
-+#endif
+ /* fs/open.c */
  
-               status = -ENOMEM;       /* we'll assign it later anyway */
-               page = __grab_cache_page(mapping, index, &cached_page);
---- linux/kernel/ksyms.c.lustre-orig   Sun Jan 20 17:47:43 2002
-+++ linux/kernel/ksyms.c       Sun Jan 20 18:21:30 2002
-@@ -280,6 +280,13 @@
+diff -u -r linux-2.4.17-stock/kernel/ksyms.c linux-2.4.17/kernel/ksyms.c
+--- linux-2.4.17-stock/kernel/ksyms.c  Fri Dec 21 09:42:04 2001
++++ linux-2.4.17/kernel/ksyms.c        Wed Feb 20 12:57:32 2002
+@@ -280,6 +280,18 @@
  EXPORT_SYMBOL(lock_page);
  EXPORT_SYMBOL(unlock_page);
  
@@ -37,30 +40,38 @@
 +EXPORT_SYMBOL(sys_mkdir);
 +EXPORT_SYMBOL(sys_rmdir);
 +EXPORT_SYMBOL(sys_unlink);
++EXPORT_SYMBOL(sys_open);
++EXPORT_SYMBOL(sys_fstat64);
++EXPORT_SYMBOL(sys_read);
++EXPORT_SYMBOL(sys_write);
 +
  /* device registration */
  EXPORT_SYMBOL(register_chrdev);
  EXPORT_SYMBOL(unregister_chrdev);
---- linux/include/linux/fs.h.lustre-orig       Sun Jan 20 17:32:26 2002
-+++ linux/include/linux/fs.h   Sun Jan 20 18:23:42 2002
-@@ -984,6 +984,8 @@
- extern int may_umount(struct vfsmount *);
- extern long do_mount(char *, char *, char *, unsigned long, void *);
+diff -u -r linux-2.4.17-stock/mm/filemap.c linux-2.4.17/mm/filemap.c
+--- linux-2.4.17-stock/mm/filemap.c    Fri Dec 21 09:42:04 2001
++++ linux-2.4.17/mm/filemap.c  Wed Feb 20 15:18:17 2002
+@@ -2862,8 +2862,10 @@
+       if ((ssize_t) count < 0)
+               return -EINVAL;
  
-+struct vfsmount *do_kern_mount(char *type, int flags, char *name, void *data);
-+int do_umount(struct vfsmount *mnt, int flags);
- #define kern_umount mntput
++#if 0
+       if (!access_ok(VERIFY_READ, buf, count))
+               return -EFAULT;
++#endif
  
- extern int vfs_statfs(struct super_block *, struct statfs *);
-@@ -1043,6 +1045,11 @@
-       return 0;
- }
+       cached_page = NULL;
  
-+/* fs/namei.c */ 
-+asmlinkage long sys_mkdir(const char * pathname, int mode);
-+asmlinkage long sys_rmdir(const char * pathname);
-+asmlinkage long sys_unlink(const char * pathname);
-+
- /* fs/open.c */
+@@ -2987,10 +2989,12 @@
+                * same page as we're writing to, without it being marked
+                * up-to-date.
+                */
++#if 0
+               { volatile unsigned char dummy;
+                       __get_user(dummy, buf);
+                       __get_user(dummy, buf+bytes-1);
+               }
++#endif
  
- asmlinkage long sys_open(const char *, int, int);
+               status = -ENOMEM;       /* we'll assign it later anyway */
+               page = __grab_cache_page(mapping, index, &cached_page);