From 854d9cdf047f3140f51688c038d77039579846b4 Mon Sep 17 00:00:00 2001 From: braam Date: Mon, 21 Jan 2002 00:48:30 +0000 Subject: [PATCH] this minimal patch might actually work. filter obd won't work: we don't need it now. --- lustre/mds/handler.c | 3 ++- lustre/ost/ost_handler.c | 2 +- lustre/patches/patch-2.4.17 | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 lustre/patches/patch-2.4.17 diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index d668605..f272a2cc 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -387,7 +388,7 @@ static int mds_setup(struct obd_device *obddev, obd_count len, mds->mds_ctxt.fs = KERNEL_DS; MDS = mds; - spin_lock_init(&obddev->u.mds.fo_lock); + spin_lock_init(&obddev->u.mds.mds_lock); mds_start_srv_thread(mds); diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index 51468c8..4e7b04f 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -519,7 +519,7 @@ static int ost_setup(struct obd_device *obddev, obd_count len, ost->ost_thread = NULL; ost->ost_flags = 0; - spin_lock_init(&obddev->u.ost.fo_lock); + spin_lock_init(&obddev->u.ost.ost_lock); ost_start_srv_thread(obddev); diff --git a/lustre/patches/patch-2.4.17 b/lustre/patches/patch-2.4.17 new file mode 100644 index 0000000..586321a --- /dev/null +++ b/lustre/patches/patch-2.4.17 @@ -0,0 +1,39 @@ +--- linux/kernel/ksyms.c.lustre-orig Sun Jan 20 17:47:43 2002 ++++ linux/kernel/ksyms.c Sun Jan 20 17:34:49 2002 +@@ -280,6 +280,13 @@ + EXPORT_SYMBOL(lock_page); + EXPORT_SYMBOL(unlock_page); + ++/* Lustre symbols */ ++EXPORT_SYMBOL(do_kern_mount); ++EXPORT_SYMBOL(do_umount); ++EXPORT_SYMBOL(sys_mkdir); ++EXPORT_SYMBOL(sys_rmdir); ++EXPORT_SYMBOL(sys_unlink); ++ + /* 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 17:45:27 2002 +@@ -984,6 +984,8 @@ + extern int may_umount(struct vfsmount *); + extern long do_mount(char *, char *, char *, unsigned long, void *); + ++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 + + extern int vfs_statfs(struct super_block *, struct statfs *); +@@ -1043,6 +1045,11 @@ + 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); ++ + /* fs/open.c */ + + asmlinkage long sys_open(const char *, int, int); -- 1.8.3.1