From dd2369eef01b940387ab5aac7ea2d834a58ccaad Mon Sep 17 00:00:00 2001 From: braam Date: Tue, 22 Apr 2003 19:58:45 +0000 Subject: [PATCH] - small error in intent patch fixed - add a cvs test to sanity - update the UML config file, it's still wrong --- lustre/kernel_patches/config/config-linux-2.4.20-uml | 2 +- .../patches/vfs_intent-2.4.20-vanilla.patch | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lustre/kernel_patches/config/config-linux-2.4.20-uml b/lustre/kernel_patches/config/config-linux-2.4.20-uml index 0851d3b..2d4a2d5 100644 --- a/lustre/kernel_patches/config/config-linux-2.4.20-uml +++ b/lustre/kernel_patches/config/config-linux-2.4.20-uml @@ -38,7 +38,7 @@ CONFIG_KERNEL_HALF_GIGS=1 # CONFIG_HIGHMEM is not set # CONFIG_PROC_MM is not set CONFIG_KERNEL_STACK_ORDER=2 - +CONFIG_MODE_TT=y # # Loadable module support # diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch index a7a4076..063e382 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch @@ -9,7 +9,7 @@ 8 files changed, 504 insertions(+), 84 deletions(-) --- linux-2.4.20/fs/dcache.c~vfs_intent-2.4.20-vanilla 2002-11-28 16:53:15.000000000 -0700 -+++ linux-2.4.20-braam/fs/dcache.c 2003-04-22 12:23:48.000000000 -0600 ++++ linux-2.4.20-braam/fs/dcache.c 2003-04-22 13:50:56.000000000 -0600 @@ -181,6 +181,13 @@ int d_invalidate(struct dentry * dentry) spin_unlock(&dcache_lock); return 0; @@ -56,7 +56,7 @@ #define do_switch(x,y) do { \ --- linux-2.4.20/fs/namei.c~vfs_intent-2.4.20-vanilla 2002-11-28 16:53:15.000000000 -0700 -+++ linux-2.4.20-braam/fs/namei.c 2003-04-22 12:23:48.000000000 -0600 ++++ linux-2.4.20-braam/fs/namei.c 2003-04-22 13:50:56.000000000 -0600 @@ -94,6 +94,13 @@ * XEmacs seems to be relying on it... */ @@ -869,7 +869,7 @@ kunmap(page); page_cache_release(page); --- linux-2.4.20/fs/nfsd/vfs.c~vfs_intent-2.4.20-vanilla 2002-11-28 16:53:15.000000000 -0700 -+++ linux-2.4.20-braam/fs/nfsd/vfs.c 2003-04-22 12:23:48.000000000 -0600 ++++ linux-2.4.20-braam/fs/nfsd/vfs.c 2003-04-22 13:50:56.000000000 -0600 @@ -1291,7 +1291,7 @@ nfsd_rename(struct svc_rqst *rqstp, stru err = nfserr_perm; } else @@ -880,7 +880,7 @@ nfsd_sync_dir(tdentry); nfsd_sync_dir(fdentry); --- linux-2.4.20/fs/open.c~vfs_intent-2.4.20-vanilla 2002-11-28 16:53:15.000000000 -0700 -+++ linux-2.4.20-braam/fs/open.c 2003-04-22 12:23:48.000000000 -0600 ++++ linux-2.4.20-braam/fs/open.c 2003-04-22 13:50:56.000000000 -0600 @@ -19,6 +19,8 @@ #include @@ -1206,7 +1206,7 @@ * Find an empty file descriptor entry, and mark it busy. */ --- linux-2.4.20/fs/stat.c~vfs_intent-2.4.20-vanilla 2001-09-13 17:04:43.000000000 -0600 -+++ linux-2.4.20-braam/fs/stat.c 2003-04-22 12:23:48.000000000 -0600 ++++ linux-2.4.20-braam/fs/stat.c 2003-04-22 13:50:56.000000000 -0600 @@ -135,13 +135,15 @@ static int cp_new_stat(struct inode * in asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf) { @@ -1308,7 +1308,7 @@ } return error; --- linux-2.4.20/include/linux/dcache.h~vfs_intent-2.4.20-vanilla 2002-11-28 16:53:15.000000000 -0700 -+++ linux-2.4.20-braam/include/linux/dcache.h 2003-04-22 12:23:48.000000000 -0600 ++++ linux-2.4.20-braam/include/linux/dcache.h 2003-04-22 13:50:56.000000000 -0600 @@ -7,6 +7,25 @@ #include #include @@ -1367,8 +1367,8 @@ extern spinlock_t dcache_lock; ---- linux-2.4.20/include/linux/fs.h~vfs_intent-2.4.20-vanilla 2003-04-22 12:23:46.000000000 -0600 -+++ linux-2.4.20-braam/include/linux/fs.h 2003-04-22 12:23:48.000000000 -0600 +--- linux-2.4.20/include/linux/fs.h~vfs_intent-2.4.20-vanilla 2003-04-22 13:50:52.000000000 -0600 ++++ linux-2.4.20-braam/include/linux/fs.h 2003-04-22 13:50:56.000000000 -0600 @@ -338,6 +338,8 @@ extern void set_bh_page(struct buffer_he #define ATTR_MTIME_SET 256 #define ATTR_FORCE 512 /* Not a change, but a change it */ @@ -1473,8 +1473,8 @@ extern int page_readlink(struct dentry *, char *, int); extern int page_follow_link(struct dentry *, struct nameidata *); extern struct inode_operations page_symlink_inode_operations; ---- linux-2.4.20/kernel/ksyms.c~vfs_intent-2.4.20-vanilla 2003-04-22 12:23:47.000000000 -0600 -+++ linux-2.4.20-braam/kernel/ksyms.c 2003-04-22 12:23:48.000000000 -0600 +--- linux-2.4.20/kernel/ksyms.c~vfs_intent-2.4.20-vanilla 2003-04-22 13:50:53.000000000 -0600 ++++ linux-2.4.20-braam/kernel/ksyms.c 2003-04-22 13:50:56.000000000 -0600 @@ -269,6 +269,7 @@ EXPORT_SYMBOL(read_cache_page); EXPORT_SYMBOL(set_page_dirty); EXPORT_SYMBOL(vfs_readlink); -- 1.8.3.1