From 2a3bd5f94c3e4b6d32308ec6d0c14c06066a2d7b Mon Sep 17 00:00:00 2001 From: ericm Date: Tue, 29 Jul 2003 01:41:51 +0000 Subject: [PATCH] merge b_devel to b_eq: 20030728 kernel_patches --- .../patches/ext3-map_inode_page.patch | 10 +- lustre/kernel_patches/patches/iopen-2.5.73.patch | 24 +- .../patches/vfs_intent-2.4.18-18-chaos65.patch | 410 ++++++++++----------- 3 files changed, 209 insertions(+), 235 deletions(-) diff --git a/lustre/kernel_patches/patches/ext3-map_inode_page.patch b/lustre/kernel_patches/patches/ext3-map_inode_page.patch index c9b7c15..912bb3f6 100644 --- a/lustre/kernel_patches/patches/ext3-map_inode_page.patch +++ b/lustre/kernel_patches/patches/ext3-map_inode_page.patch @@ -5,9 +5,9 @@ fs/ext3/inode.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) ---- linux-2.4.20-l18/fs/ext3/inode.c~ext3-map_inode_page Tue Jul 8 20:07:23 2003 -+++ linux-2.4.20-l18-phil/fs/ext3/inode.c Wed Jul 9 03:56:41 2003 -@@ -2867,3 +2867,58 @@ int ext3_prep_san_write(struct inode *in +--- linux-2.4.20-l18/fs/ext3/inode.c~ext3-map_inode_page Fri Jul 25 14:36:14 2003 ++++ linux-2.4.20-l18-phil/fs/ext3/inode.c Fri Jul 25 14:36:14 2003 +@@ -2979,3 +2979,58 @@ int ext3_prep_san_write(struct inode *in ret = ret2; return ret; } @@ -66,8 +66,8 @@ + unlock_kernel(); + return rc; +} ---- linux-2.4.20-l18/fs/ext3/ext3-exports.c~ext3-map_inode_page Tue Jul 8 20:07:10 2003 -+++ linux-2.4.20-l18-phil/fs/ext3/ext3-exports.c Tue Jul 8 20:09:02 2003 +--- linux-2.4.20-l18/fs/ext3/ext3-exports.c~ext3-map_inode_page Fri Jul 25 14:36:14 2003 ++++ linux-2.4.20-l18-phil/fs/ext3/ext3-exports.c Fri Jul 25 14:36:14 2003 @@ -9,6 +9,8 @@ int ext3_prep_san_write(struct inode *inode, long *blocks, diff --git a/lustre/kernel_patches/patches/iopen-2.5.73.patch b/lustre/kernel_patches/patches/iopen-2.5.73.patch index c9d4223..408aa43 100644 --- a/lustre/kernel_patches/patches/iopen-2.5.73.patch +++ b/lustre/kernel_patches/patches/iopen-2.5.73.patch @@ -9,7 +9,7 @@ 8 files changed, 300 insertions(+), 1 deletion(-) --- linux-2.6.0-test1/Documentation/filesystems/ext2.txt~iopen-2.5.73 2003-07-13 21:31:56.000000000 -0600 -+++ linux-2.6.0-test1-braam/Documentation/filesystems/ext2.txt 2003-07-22 01:15:46.000000000 -0600 ++++ linux-2.6.0-test1-braam/Documentation/filesystems/ext2.txt 2003-07-22 13:03:47.000000000 -0600 @@ -35,6 +35,22 @@ resgid=n The group ID which may use th sb=n Use alternate superblock at this location. @@ -34,7 +34,7 @@ --- linux-2.6.0-test1/fs/ext3/Makefile~iopen-2.5.73 2003-07-13 21:30:37.000000000 -0600 -+++ linux-2.6.0-test1-braam/fs/ext3/Makefile 2003-07-22 01:15:46.000000000 -0600 ++++ linux-2.6.0-test1-braam/fs/ext3/Makefile 2003-07-22 13:03:47.000000000 -0600 @@ -5,7 +5,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o @@ -44,8 +44,8 @@ ifeq ($(CONFIG_EXT3_FS_XATTR),y) ext3-objs += xattr.o xattr_user.o xattr_trusted.o ---- linux-2.6.0-test1/fs/ext3/inode.c~iopen-2.5.73 2003-07-22 01:15:25.000000000 -0600 -+++ linux-2.6.0-test1-braam/fs/ext3/inode.c 2003-07-22 01:16:19.000000000 -0600 +--- linux-2.6.0-test1/fs/ext3/inode.c~iopen-2.5.73 2003-07-22 13:03:47.000000000 -0600 ++++ linux-2.6.0-test1-braam/fs/ext3/inode.c 2003-07-22 13:03:47.000000000 -0600 @@ -37,6 +37,7 @@ #include #include @@ -64,7 +64,7 @@ goto bad_inode; bh = iloc.bh; --- /dev/null 2003-01-30 03:24:37.000000000 -0700 -+++ linux-2.6.0-test1-braam/fs/ext3/iopen.c 2003-07-22 01:15:46.000000000 -0600 ++++ linux-2.6.0-test1-braam/fs/ext3/iopen.c 2003-07-22 13:07:32.000000000 -0600 @@ -0,0 +1,239 @@ + + @@ -96,7 +96,7 @@ +/* + * This implements looking up an inode by number. + */ -+static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry) ++static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd) +{ + struct inode * inode; + unsigned long ino; @@ -306,7 +306,7 @@ + return 1; +} --- /dev/null 2003-01-30 03:24:37.000000000 -0700 -+++ linux-2.6.0-test1-braam/fs/ext3/iopen.h 2003-07-22 01:15:46.000000000 -0600 ++++ linux-2.6.0-test1-braam/fs/ext3/iopen.h 2003-07-22 13:03:47.000000000 -0600 @@ -0,0 +1,15 @@ +/* + * iopen.h @@ -324,7 +324,7 @@ + + --- linux-2.6.0-test1/fs/ext3/namei.c~iopen-2.5.73 2003-07-13 21:34:43.000000000 -0600 -+++ linux-2.6.0-test1-braam/fs/ext3/namei.c 2003-07-22 01:17:20.000000000 -0600 ++++ linux-2.6.0-test1-braam/fs/ext3/namei.c 2003-07-22 13:03:47.000000000 -0600 @@ -37,6 +37,7 @@ #include #include @@ -368,8 +368,8 @@ d_add(dentry, inode); return NULL; } ---- linux-2.6.0-test1/fs/ext3/super.c~iopen-2.5.73 2003-07-22 01:15:25.000000000 -0600 -+++ linux-2.6.0-test1-braam/fs/ext3/super.c 2003-07-22 01:15:46.000000000 -0600 +--- linux-2.6.0-test1/fs/ext3/super.c~iopen-2.5.73 2003-07-22 13:03:47.000000000 -0600 ++++ linux-2.6.0-test1-braam/fs/ext3/super.c 2003-07-22 13:03:47.000000000 -0600 @@ -755,6 +755,17 @@ static int parse_options (char * options || !strcmp (this_char, "quota") || !strcmp (this_char, "usrquota")) @@ -388,8 +388,8 @@ else if (!strcmp (this_char, "journal")) { /* @@@ FIXME */ /* Eventually we will want to be able to create ---- linux-2.6.0-test1/include/linux/ext3_fs.h~iopen-2.5.73 2003-07-22 01:14:05.000000000 -0600 -+++ linux-2.6.0-test1-braam/include/linux/ext3_fs.h 2003-07-22 01:15:46.000000000 -0600 +--- linux-2.6.0-test1/include/linux/ext3_fs.h~iopen-2.5.73 2003-07-22 11:04:35.000000000 -0600 ++++ linux-2.6.0-test1-braam/include/linux/ext3_fs.h 2003-07-22 13:03:47.000000000 -0600 @@ -324,6 +324,8 @@ struct ext3_inode { #define EXT3_MOUNT_NO_UID32 0x2000 /* Disable 32-bit UIDs */ #define EXT3_MOUNT_XATTR_USER 0x4000 /* Extended user attributes */ diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch index d68a351..03427ce 100644 --- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch +++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch @@ -12,9 +12,11 @@ kernel/ksyms.c | 1 12 files changed, 564 insertions(+), 99 deletions(-) ---- linux-2.4.18-p4smp/fs/exec.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:17:30.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/exec.c 2003-07-09 13:20:37.000000000 -0600 -@@ -117,8 +117,9 @@ asmlinkage long sys_uselib(const char * +Index: linux-2.4.18-p4smp/fs/exec.c +=================================================================== +--- linux-2.4.18-p4smp.orig/fs/exec.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/fs/exec.c Fri Jul 25 16:13:49 2003 +@@ -117,8 +117,9 @@ struct file * file; struct nameidata nd; int error; @@ -25,7 +27,7 @@ if (error) goto out; -@@ -130,7 +131,8 @@ asmlinkage long sys_uselib(const char * +@@ -130,7 +131,8 @@ if (error) goto exit; @@ -35,7 +37,7 @@ error = PTR_ERR(file); if (IS_ERR(file)) goto out; -@@ -359,8 +361,9 @@ struct file *open_exec(const char *name) +@@ -359,8 +361,9 @@ struct inode *inode; struct file *file; int err = 0; @@ -46,7 +48,7 @@ file = ERR_PTR(err); if (!err) { inode = nd.dentry->d_inode; -@@ -372,7 +375,8 @@ struct file *open_exec(const char *name) +@@ -372,7 +375,8 @@ err = -EACCES; file = ERR_PTR(err); if (!err) { @@ -56,7 +58,7 @@ if (!IS_ERR(file)) { err = deny_write_access(file); if (err) { -@@ -384,6 +388,7 @@ out: +@@ -384,6 +388,7 @@ return file; } } @@ -64,7 +66,7 @@ path_release(&nd); } goto out; -@@ -1104,7 +1109,7 @@ int do_coredump(long signr, struct pt_re +@@ -1104,7 +1109,7 @@ goto close_fail; if (!file->f_op->write) goto close_fail; @@ -73,9 +75,11 @@ goto close_fail; retval = binfmt->core_dump(signr, regs, file); ---- linux-2.4.18-p4smp/fs/dcache.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:17:30.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/dcache.c 2003-07-09 13:20:37.000000000 -0600 -@@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry) +Index: linux-2.4.18-p4smp/fs/dcache.c +=================================================================== +--- linux-2.4.18-p4smp.orig/fs/dcache.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/fs/dcache.c Fri Jul 25 16:13:49 2003 +@@ -186,6 +186,13 @@ spin_unlock(&dcache_lock); return 0; } @@ -89,7 +93,7 @@ /* * Check whether to do a partial shrink_dcache * to get rid of unused child entries. -@@ -859,13 +866,19 @@ void d_delete(struct dentry * dentry) +@@ -859,13 +866,19 @@ * Adds a dentry to the hash according to its name. */ @@ -112,9 +116,11 @@ } #define do_switch(x,y) do { \ ---- linux-2.4.18-p4smp/fs/namespace.c~vfs_intent-2.4.18-18-chaos65 2002-06-25 22:16:14.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/namespace.c 2003-07-09 13:20:37.000000000 -0600 -@@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount * +Index: linux-2.4.18-p4smp/fs/namespace.c +=================================================================== +--- linux-2.4.18-p4smp.orig/fs/namespace.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/fs/namespace.c Fri Jul 25 16:13:49 2003 +@@ -99,6 +99,7 @@ { old_nd->dentry = mnt->mnt_mountpoint; old_nd->mnt = mnt->mnt_parent; @@ -122,7 +128,7 @@ mnt->mnt_parent = mnt; mnt->mnt_mountpoint = mnt->mnt_root; list_del_init(&mnt->mnt_child); -@@ -110,6 +111,7 @@ static void attach_mnt(struct vfsmount * +@@ -110,6 +111,7 @@ { mnt->mnt_parent = mntget(nd->mnt); mnt->mnt_mountpoint = dget(nd->dentry); @@ -130,7 +136,7 @@ list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry)); list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts); nd->dentry->d_mounted++; -@@ -485,14 +487,17 @@ static int do_loopback(struct nameidata +@@ -485,14 +487,17 @@ { struct nameidata old_nd; struct vfsmount *mnt = NULL; @@ -150,7 +156,7 @@ down_write(¤t->namespace->sem); err = -EINVAL; -@@ -515,6 +520,7 @@ static int do_loopback(struct nameidata +@@ -515,6 +520,7 @@ } up_write(¤t->namespace->sem); @@ -158,17 +164,15 @@ path_release(&old_nd); return err; } -@@ -698,7 +704,8 @@ long do_mount(char * dev_name, char * di +@@ -698,6 +704,7 @@ unsigned long flags, void *data_page) { struct nameidata nd; -- int retval = 0; + struct lookup_intent it = { .it_op = IT_GETATTR }; -+ int retval = 0; + int retval = 0; int mnt_flags = 0; - /* Discard magic */ -@@ -722,10 +729,11 @@ long do_mount(char * dev_name, char * di +@@ -722,10 +729,11 @@ flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV); /* ... and get the mountpoint */ @@ -183,7 +187,7 @@ if (flags & MS_REMOUNT) retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -736,6 +744,8 @@ long do_mount(char * dev_name, char * di +@@ -736,6 +744,8 @@ else retval = do_add_mount(&nd, type_page, flags, mnt_flags, dev_name, data_page); @@ -192,7 +196,7 @@ path_release(&nd); return retval; } -@@ -901,6 +911,8 @@ asmlinkage long sys_pivot_root(const cha +@@ -901,6 +911,8 @@ { struct vfsmount *tmp; struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd; @@ -201,7 +205,7 @@ int error; if (!capable(CAP_SYS_ADMIN)) -@@ -908,14 +920,14 @@ asmlinkage long sys_pivot_root(const cha +@@ -908,14 +920,14 @@ lock_kernel(); @@ -218,7 +222,7 @@ if (error) goto out1; -@@ -970,8 +982,10 @@ out2: +@@ -970,8 +982,10 @@ up(&old_nd.dentry->d_inode->i_zombie); up_write(¤t->namespace->sem); path_release(&user_nd); @@ -229,8 +233,10 @@ path_release(&new_nd); out0: unlock_kernel(); ---- linux-2.4.18-p4smp/fs/namei.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:17:30.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/namei.c 2003-07-09 13:20:37.000000000 -0600 +Index: linux-2.4.18-p4smp/fs/namei.c +=================================================================== +--- linux-2.4.18-p4smp.orig/fs/namei.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/fs/namei.c Fri Jul 25 16:30:22 2003 @@ -94,6 +94,13 @@ * XEmacs seems to be relying on it... */ @@ -245,7 +251,7 @@ /* In order to reduce some races, while at the same time doing additional * checking and hopefully speeding things up, we copy filenames to the * kernel data space before using them.. -@@ -260,10 +267,19 @@ void path_release(struct nameidata *nd) +@@ -260,10 +267,19 @@ * Internal lookup() using the new generic dcache. * SMP-safe */ @@ -266,7 +272,7 @@ if (dentry && dentry->d_op && dentry->d_op->d_revalidate) { if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) { dput(dentry); -@@ -281,11 +297,14 @@ static struct dentry * cached_lookup(str +@@ -281,11 +297,14 @@ * make sure that nobody added the entry to the dcache in the meantime.. * SMP-safe */ @@ -282,7 +288,7 @@ down(&dir->i_sem); /* * First re-do the cached lookup just in case it was created -@@ -300,6 +319,9 @@ static struct dentry * real_lookup(struc +@@ -300,6 +319,9 @@ result = ERR_PTR(-ENOMEM); if (dentry) { lock_kernel(); @@ -292,7 +298,7 @@ result = dir->i_op->lookup(dir, dentry); unlock_kernel(); if (result) -@@ -321,6 +343,12 @@ static struct dentry * real_lookup(struc +@@ -321,6 +343,12 @@ dput(result); result = ERR_PTR(-ENOENT); } @@ -305,7 +311,7 @@ } return result; } -@@ -334,7 +362,8 @@ int max_recursive_link = 5; +@@ -334,7 +362,8 @@ * Without that kind of total limit, nasty chains of consecutive * symlinks can cause almost arbitrarily long lookups. */ @@ -315,22 +321,13 @@ { int err; if (current->link_count >= max_recursive_link) -@@ -348,10 +377,21 @@ static inline int do_follow_link(struct +@@ -348,10 +377,12 @@ current->link_count++; current->total_link_count++; UPDATE_ATIME(dentry->d_inode); - err = dentry->d_inode->i_op->follow_link(dentry, nd); -+ nd->it = it; -+ if (dentry->d_inode->i_op->follow_link2) -+ err = dentry->d_inode->i_op->follow_link2(dentry, nd, it); -+ else -+ err = dentry->d_inode->i_op->follow_link(dentry, nd); -+ if (!err && it != NULL && !(it->it_int_flags & IT_FL_FOLLOWED)) { -+ /* vfs_follow_link was never called */ -+ intent_release(it); -+ path_release(nd); -+ err = -ENOLINK; -+ } ++ nd->intent = it; ++ err = dentry->d_inode->i_op->follow_link(dentry, nd); current->link_count--; return err; loop: @@ -338,7 +335,7 @@ path_release(nd); return -ELOOP; } -@@ -381,15 +421,26 @@ int follow_up(struct vfsmount **mnt, str +@@ -381,7 +412,8 @@ return __follow_up(mnt, dentry); } @@ -348,25 +345,7 @@ { struct vfsmount *mounted; - spin_lock(&dcache_lock); - mounted = lookup_mnt(*mnt, *dentry); - if (mounted) { -+ int opc = 0, mode = 0; - *mnt = mntget(mounted); - spin_unlock(&dcache_lock); -+ if (it) { -+ opc = it->it_op; -+ mode = it->it_mode; -+ } -+ intent_release(it); -+ if (it) { -+ it->it_op = opc; -+ it->it_mode = mode; -+ } - dput(*dentry); - mntput(mounted->mnt_parent); - *dentry = dget(mounted->mnt_root); -@@ -401,7 +452,7 @@ static inline int __follow_down(struct v +@@ -401,7 +433,7 @@ int follow_down(struct vfsmount **mnt, struct dentry **dentry) { @@ -375,7 +354,7 @@ } static inline void follow_dotdot(struct nameidata *nd) -@@ -437,7 +488,7 @@ static inline void follow_dotdot(struct +@@ -437,7 +469,7 @@ mntput(nd->mnt); nd->mnt = parent; } @@ -384,7 +363,7 @@ ; } -@@ -449,7 +500,8 @@ static inline void follow_dotdot(struct +@@ -449,7 +481,8 @@ * * We expect 'base' to be positive and a directory. */ @@ -394,7 +373,7 @@ { struct dentry *dentry; struct inode *inode; -@@ -526,18 +578,18 @@ int link_path_walk(const char * name, st +@@ -526,18 +559,18 @@ break; } /* This does the actual lookups.. */ @@ -416,7 +395,7 @@ ; err = -ENOENT; -@@ -548,8 +600,8 @@ int link_path_walk(const char * name, st +@@ -548,8 +581,8 @@ if (!inode->i_op) goto out_dput; @@ -427,7 +406,7 @@ dput(dentry); if (err) goto return_err; -@@ -565,7 +617,7 @@ int link_path_walk(const char * name, st +@@ -565,7 +598,7 @@ nd->dentry = dentry; } err = -ENOTDIR; @@ -436,7 +415,7 @@ break; continue; /* here ends the main loop */ -@@ -592,22 +644,23 @@ last_component: +@@ -592,22 +625,23 @@ if (err < 0) break; } @@ -465,7 +444,7 @@ dput(dentry); if (err) goto return_err; -@@ -621,7 +674,8 @@ last_component: +@@ -621,7 +655,8 @@ goto no_inode; if (lookup_flags & LOOKUP_DIRECTORY) { err = -ENOTDIR; @@ -475,7 +454,7 @@ break; } goto return_base; -@@ -645,7 +699,24 @@ return_reval: +@@ -645,7 +680,24 @@ * Check the cached dentry for staleness. */ dentry = nd->dentry; @@ -501,7 +480,7 @@ err = -ESTALE; if (!dentry->d_op->d_revalidate(dentry, 0)) { d_invalidate(dentry); -@@ -658,15 +729,28 @@ out_dput: +@@ -658,15 +710,28 @@ dput(dentry); break; } @@ -531,7 +510,7 @@ } /* SMP-safe */ -@@ -751,6 +835,17 @@ walk_init_root(const char *name, struct +@@ -751,6 +816,17 @@ } /* SMP-safe */ @@ -549,15 +528,15 @@ int path_lookup(const char *path, unsigned flags, struct nameidata *nd) { int error = 0; -@@ -765,6 +860,7 @@ int path_init(const char *name, unsigned +@@ -765,6 +841,7 @@ { nd->last_type = LAST_ROOT; /* if there are only slashes... */ nd->flags = flags; -+ nd->it = NULL; ++ nd->intent = NULL; if (*name=='/') return walk_init_root(name,nd); read_lock(¤t->fs->lock); -@@ -779,7 +875,8 @@ int path_init(const char *name, unsigned +@@ -779,7 +856,8 @@ * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -567,7 +546,7 @@ { struct dentry * dentry; struct inode *inode; -@@ -802,13 +899,16 @@ struct dentry * lookup_hash(struct qstr +@@ -802,13 +880,16 @@ goto out; } @@ -585,7 +564,7 @@ dentry = inode->i_op->lookup(inode, new); unlock_kernel(); if (!dentry) -@@ -820,6 +920,12 @@ out: +@@ -820,6 +901,12 @@ return dentry; } @@ -598,7 +577,7 @@ /* SMP-safe */ struct dentry * lookup_one_len(const char * name, struct dentry * base, int len) { -@@ -841,7 +947,7 @@ struct dentry * lookup_one_len(const cha +@@ -841,7 +928,7 @@ } this.hash = end_name_hash(hash); @@ -607,7 +586,7 @@ access: return ERR_PTR(-EACCES); } -@@ -872,6 +978,23 @@ int __user_walk(const char *name, unsign +@@ -872,6 +959,23 @@ return err; } @@ -631,7 +610,7 @@ /* * It's inline, so penalty for filesystems that don't use sticky bit is * minimal. -@@ -969,6 +1092,37 @@ static inline int lookup_flags(unsigned +@@ -969,6 +1073,37 @@ return retval; } @@ -669,24 +648,14 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode) { int error; -@@ -987,7 +1141,7 @@ int vfs_create(struct inode *dir, struct - - DQUOT_INIT(dir); - lock_kernel(); -- error = dir->i_op->create(dir, dentry, mode); -+ error = dir->i_op->create(dir, dentry, mode); - unlock_kernel(); - exit_lock: - up(&dir->i_zombie); -@@ -1045,14 +1199,17 @@ int may_open(struct nameidata *nd, int a +@@ -1045,14 +1180,17 @@ return get_lease(inode, flag); } --struct file *filp_open(const char * pathname, int open_flags, int mode) +extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, + int flags, struct lookup_intent *it); + -+struct file *filp_open(const char * pathname, int open_flags, int mode) + struct file *filp_open(const char * pathname, int open_flags, int mode) { int acc_mode, error = 0; - struct inode *inode; @@ -694,11 +663,18 @@ struct dentry *dir; int flag = open_flags; struct nameidata nd; -+ struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = open_flags }; ++ struct lookup_intent it = { .it_op = IT_OPEN}; int count = 0; if (!capable(CAP_SYS_ADMIN)) -@@ -1069,7 +1226,7 @@ struct file *filp_open(const char * path +@@ -1063,13 +1201,14 @@ + if (flag & O_TRUNC) + flag |= 2; + ++ it.it_flags = flag; + acc_mode = ACC_MODE(flag); + + /* * The simplest case - just a plain lookup. */ if (!(flag & O_CREAT)) { @@ -707,16 +683,16 @@ if (error) return ERR_PTR(error); dentry = nd.dentry; -@@ -1079,6 +1236,8 @@ struct file *filp_open(const char * path +@@ -1079,6 +1218,8 @@ /* * Create - we need to know the parent. */ -+ it.it_mode = mode; ++ it.it_create_mode = mode; + it.it_op |= IT_CREAT; error = path_lookup(pathname, LOOKUP_PARENT, &nd); if (error) return ERR_PTR(error); -@@ -1094,7 +1253,7 @@ struct file *filp_open(const char * path +@@ -1094,7 +1235,7 @@ dir = nd.dentry; down(&dir->d_inode->i_sem); @@ -725,11 +701,11 @@ do_last: error = PTR_ERR(dentry); -@@ -1103,10 +1262,11 @@ do_last: +@@ -1103,10 +1244,11 @@ goto exit; } -+ it.it_mode = mode; ++ it.it_create_mode = mode; /* Negative dentry, just create the file */ if (!dentry->d_inode) { - error = vfs_create(dir->d_inode, dentry, @@ -739,7 +715,7 @@ up(&dir->d_inode->i_sem); dput(nd.dentry); nd.dentry = dentry; -@@ -1132,12 +1292,12 @@ do_last: +@@ -1132,12 +1274,12 @@ error = -ELOOP; if (flag & O_NOFOLLOW) goto exit_dput; @@ -754,7 +730,7 @@ goto do_link; dput(nd.dentry); -@@ -1152,11 +1312,13 @@ ok: +@@ -1152,11 +1294,13 @@ if (!S_ISREG(nd.dentry->d_inode->i_mode)) open_flags &= ~O_TRUNC; @@ -769,20 +745,14 @@ path_release(&nd); return ERR_PTR(error); -@@ -1175,10 +1337,19 @@ do_link: +@@ -1175,10 +1319,14 @@ * are done. Procfs-like symlinks just set LAST_BIND. */ UPDATE_ATIME(dentry->d_inode); -- error = dentry->d_inode->i_op->follow_link(dentry, &nd); -+ nd.it = ⁢ -+ error = dentry->d_inode->i_op->follow_link(dentry, &nd); ++ nd.intent = ⁢ + error = dentry->d_inode->i_op->follow_link(dentry, &nd); + if (error) { + intent_release(&it); -+ } else if (!(it.it_int_flags & IT_FL_FOLLOWED)) { -+ /* vfs_follow_link was never called */ -+ intent_release(&it); -+ path_release(&nd); -+ error = -ENOLINK; + } dput(dentry); if (error) @@ -791,7 +761,7 @@ if (nd.last_type == LAST_BIND) { dentry = nd.dentry; goto ok; -@@ -1197,13 +1368,15 @@ do_link: +@@ -1197,13 +1345,15 @@ } dir = nd.dentry; down(&dir->d_inode->i_sem); @@ -809,7 +779,7 @@ { struct dentry *dentry; -@@ -1211,7 +1384,7 @@ static struct dentry *lookup_create(stru +@@ -1211,7 +1361,7 @@ dentry = ERR_PTR(-EEXIST); if (nd->last_type != LAST_NORM) goto fail; @@ -818,7 +788,7 @@ if (IS_ERR(dentry)) goto fail; if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode) -@@ -1267,7 +1440,16 @@ asmlinkage long sys_mknod(const char * f +@@ -1267,7 +1417,16 @@ error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; @@ -836,7 +806,7 @@ error = PTR_ERR(dentry); mode &= ~current->fs->umask; -@@ -1288,6 +1470,7 @@ asmlinkage long sys_mknod(const char * f +@@ -1288,6 +1447,7 @@ dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -844,7 +814,7 @@ path_release(&nd); out: putname(tmp); -@@ -1335,7 +1518,14 @@ asmlinkage long sys_mkdir(const char * p +@@ -1335,7 +1495,14 @@ error = path_lookup(tmp, LOOKUP_PARENT, &nd); if (error) goto out; @@ -860,7 +830,7 @@ error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { error = vfs_mkdir(nd.dentry->d_inode, dentry, -@@ -1343,6 +1533,7 @@ asmlinkage long sys_mkdir(const char * p +@@ -1343,6 +1510,7 @@ dput(dentry); } up(&nd.dentry->d_inode->i_sem); @@ -868,7 +838,7 @@ path_release(&nd); out: putname(tmp); -@@ -1443,8 +1634,16 @@ asmlinkage long sys_rmdir(const char * p +@@ -1443,8 +1611,16 @@ error = -EBUSY; goto exit1; } @@ -886,7 +856,7 @@ error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { error = vfs_rmdir(nd.dentry->d_inode, dentry); -@@ -1502,8 +1701,15 @@ asmlinkage long sys_unlink(const char * +@@ -1502,8 +1678,15 @@ error = -EISDIR; if (nd.last_type != LAST_NORM) goto exit1; @@ -903,7 +873,7 @@ error = PTR_ERR(dentry); if (!IS_ERR(dentry)) { /* Why not before? Because we want correct error value */ -@@ -1570,15 +1776,23 @@ asmlinkage long sys_symlink(const char * +@@ -1570,15 +1753,23 @@ error = path_lookup(to, LOOKUP_PARENT, &nd); if (error) goto out; @@ -929,7 +899,7 @@ putname(to); } putname(from); -@@ -1654,7 +1868,14 @@ asmlinkage long sys_link(const char * ol +@@ -1654,7 +1845,14 @@ error = -EXDEV; if (old_nd.mnt != nd.mnt) goto out_release; @@ -945,7 +915,7 @@ error = PTR_ERR(new_dentry); if (!IS_ERR(new_dentry)) { error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry); -@@ -1698,7 +1919,7 @@ exit: +@@ -1698,7 +1896,7 @@ * locking]. */ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry, @@ -954,7 +924,7 @@ { int error; struct inode *target; -@@ -1777,7 +1998,7 @@ out_unlock: +@@ -1777,7 +1975,7 @@ } int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, @@ -963,7 +933,7 @@ { int error; -@@ -1865,9 +2086,18 @@ static inline int do_rename(const char * +@@ -1865,9 +2063,18 @@ if (newnd.last_type != LAST_NORM) goto exit2; @@ -983,7 +953,7 @@ error = PTR_ERR(old_dentry); if (IS_ERR(old_dentry)) goto exit3; -@@ -1883,16 +2113,16 @@ static inline int do_rename(const char * +@@ -1883,16 +2090,16 @@ if (newnd.last.name[newnd.last.len]) goto exit4; } @@ -1002,7 +972,7 @@ dput(new_dentry); exit4: dput(old_dentry); -@@ -1943,12 +2173,19 @@ out: +@@ -1943,12 +2150,17 @@ } static inline int @@ -1015,15 +985,13 @@ if (IS_ERR(link)) goto fail; + if (it == NULL) -+ it = nd->it; -+ else if (it != nd->it) -+ printk("it != nd->it: tell phil@clusterfs.com\n"); -+ if (it != NULL) -+ it->it_int_flags |= IT_FL_FOLLOWED; ++ it = nd->intent; ++ else if (it != nd->intent) ++ printk("it != nd->intent: tell phil@clusterfs.com\n"); if (*link == '/') { path_release(nd); -@@ -1956,7 +2193,7 @@ __vfs_follow_link(struct nameidata *nd, +@@ -1956,7 +2168,7 @@ /* weird __emul_prefix() stuff did it */ goto out; } @@ -1032,7 +1000,7 @@ out: if (current->link_count || res || nd->last_type!=LAST_NORM) return res; -@@ -1978,7 +2215,13 @@ fail: +@@ -1978,7 +2190,13 @@ int vfs_follow_link(struct nameidata *nd, const char *link) { @@ -1047,7 +1015,7 @@ } /* get the link contents into pagecache */ -@@ -2020,7 +2263,7 @@ int page_follow_link(struct dentry *dent +@@ -2020,7 +2238,7 @@ { struct page *page = NULL; char *s = page_getlink(dentry, &page); @@ -1056,8 +1024,10 @@ if (page) { kunmap(page); page_cache_release(page); ---- linux-2.4.18-p4smp/fs/open.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:17:30.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/open.c 2003-07-09 13:20:37.000000000 -0600 +Index: linux-2.4.18-p4smp/fs/open.c +=================================================================== +--- linux-2.4.18-p4smp.orig/fs/open.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/fs/open.c Fri Jul 25 16:13:49 2003 @@ -19,6 +19,8 @@ #include @@ -1067,7 +1037,7 @@ int vfs_statfs(struct super_block *sb, struct statfs *buf) { -@@ -95,9 +97,10 @@ void fd_install(unsigned int fd, struct +@@ -95,9 +97,10 @@ write_unlock(&files->file_lock); } @@ -1079,7 +1049,7 @@ int error; struct iattr newattrs; -@@ -108,7 +111,13 @@ int do_truncate(struct dentry *dentry, l +@@ -108,7 +111,13 @@ down(&inode->i_sem); newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME; @@ -1094,7 +1064,7 @@ up(&inode->i_sem); return error; } -@@ -118,12 +128,13 @@ static inline long do_sys_truncate(const +@@ -118,12 +127,13 @@ struct nameidata nd; struct inode * inode; int error; @@ -1109,7 +1079,7 @@ if (error) goto out; inode = nd.dentry->d_inode; -@@ -163,11 +174,13 @@ static inline long do_sys_truncate(const +@@ -163,11 +173,13 @@ error = locks_verify_truncate(inode, NULL, length); if (!error) { DQUOT_INIT(inode); @@ -1124,7 +1094,7 @@ path_release(&nd); out: return error; -@@ -215,7 +228,7 @@ static inline long do_sys_ftruncate(unsi +@@ -215,7 +227,7 @@ error = locks_verify_truncate(inode, file, length); if (!error) @@ -1133,7 +1103,7 @@ out_putf: fput(file); out: -@@ -260,11 +273,13 @@ asmlinkage long sys_utime(char * filenam +@@ -260,11 +272,13 @@ struct inode * inode; struct iattr newattrs; @@ -1148,7 +1118,7 @@ error = -EROFS; if (IS_RDONLY(inode)) goto dput_and_out; -@@ -279,11 +294,25 @@ asmlinkage long sys_utime(char * filenam +@@ -279,11 +293,25 @@ goto dput_and_out; newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -1175,7 +1145,7 @@ error = notify_change(nd.dentry, &newattrs); dput_and_out: path_release(&nd); -@@ -304,12 +337,14 @@ asmlinkage long sys_utimes(char * filena +@@ -304,12 +332,14 @@ struct inode * inode; struct iattr newattrs; @@ -1191,7 +1161,7 @@ error = -EROFS; if (IS_RDONLY(inode)) goto dput_and_out; -@@ -324,7 +359,20 @@ asmlinkage long sys_utimes(char * filena +@@ -324,7 +354,20 @@ newattrs.ia_atime = times[0].tv_sec; newattrs.ia_mtime = times[1].tv_sec; newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET; @@ -1213,7 +1183,7 @@ if (current->fsuid != inode->i_uid && (error = permission(inode,MAY_WRITE)) != 0) goto dput_and_out; -@@ -347,6 +395,7 @@ asmlinkage long sys_access(const char * +@@ -347,6 +390,7 @@ int old_fsuid, old_fsgid; kernel_cap_t old_cap; int res; @@ -1221,7 +1191,7 @@ if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ return -EINVAL; -@@ -364,13 +413,14 @@ asmlinkage long sys_access(const char * +@@ -364,13 +408,14 @@ else current->cap_effective = current->cap_permitted; @@ -1237,7 +1207,7 @@ path_release(&nd); } -@@ -385,8 +435,11 @@ asmlinkage long sys_chdir(const char * f +@@ -385,8 +430,11 @@ { int error; struct nameidata nd; @@ -1250,7 +1220,7 @@ if (error) goto out; -@@ -397,6 +450,7 @@ asmlinkage long sys_chdir(const char * f +@@ -397,6 +445,7 @@ set_fs_pwd(current->fs, nd.mnt, nd.dentry); dput_and_out: @@ -1258,7 +1228,7 @@ path_release(&nd); out: return error; -@@ -436,9 +490,10 @@ asmlinkage long sys_chroot(const char * +@@ -436,9 +485,10 @@ { int error; struct nameidata nd; @@ -1271,7 +1241,7 @@ if (error) goto out; -@@ -454,6 +509,7 @@ asmlinkage long sys_chroot(const char * +@@ -454,6 +504,7 @@ set_fs_altroot(); error = 0; dput_and_out: @@ -1279,7 +1249,7 @@ path_release(&nd); out: return error; -@@ -508,6 +564,18 @@ asmlinkage long sys_chmod(const char * f +@@ -508,6 +559,18 @@ if (IS_RDONLY(inode)) goto dput_and_out; @@ -1298,7 +1268,7 @@ error = -EPERM; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) goto dput_and_out; -@@ -538,6 +606,20 @@ static int chown_common(struct dentry * +@@ -538,6 +601,20 @@ error = -EROFS; if (IS_RDONLY(inode)) goto out; @@ -1319,7 +1289,7 @@ error = -EPERM; if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) goto out; -@@ -628,7 +710,8 @@ extern ssize_t do_readahead(struct file +@@ -628,7 +705,8 @@ /* for files over a certains size it doesn't pay to do readahead on open */ #define READAHEAD_CUTOFF 48000 @@ -1329,7 +1299,7 @@ { struct file * f; struct inode *inode; -@@ -649,7 +732,7 @@ struct file *dentry_open(struct dentry * +@@ -649,7 +727,7 @@ error = locks_verify_locked(inode); if (!error) { DQUOT_INIT(inode); @@ -1338,7 +1308,7 @@ } if (error || !(f->f_mode & FMODE_WRITE)) put_write_access(inode); -@@ -679,7 +762,9 @@ struct file *dentry_open(struct dentry * +@@ -679,7 +757,9 @@ } if (f->f_op && f->f_op->open) { @@ -1348,7 +1318,7 @@ if (error) goto cleanup_all; } -@@ -693,6 +778,7 @@ struct file *dentry_open(struct dentry * +@@ -693,6 +773,7 @@ do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT); @@ -1356,7 +1326,7 @@ return f; cleanup_all: -@@ -707,11 +793,17 @@ cleanup_all: +@@ -707,11 +788,17 @@ cleanup_file: put_filp(f); cleanup_dentry: @@ -1374,8 +1344,10 @@ /* * Find an empty file descriptor entry, and mark it busy. */ ---- linux-2.4.18-p4smp/fs/stat.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:17:30.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/stat.c 2003-07-09 13:20:37.000000000 -0600 +Index: linux-2.4.18-p4smp/fs/stat.c +=================================================================== +--- linux-2.4.18-p4smp.orig/fs/stat.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/fs/stat.c Fri Jul 25 16:13:49 2003 @@ -17,21 +17,24 @@ * Revalidate the inode. This is required for proper NFS attribute caching. */ @@ -1405,7 +1377,7 @@ if (res) return res; -@@ -104,10 +107,12 @@ int vfs_stat(char *name, struct kstat *s +@@ -104,10 +107,12 @@ { struct nameidata nd; int error; @@ -1420,7 +1392,7 @@ path_release(&nd); } return error; -@@ -117,10 +122,12 @@ int vfs_lstat(char *name, struct kstat * +@@ -117,10 +122,12 @@ { struct nameidata nd; int error; @@ -1435,7 +1407,7 @@ path_release(&nd); } return error; -@@ -132,7 +139,7 @@ int vfs_fstat(unsigned int fd, struct ks +@@ -132,7 +139,7 @@ int error = -EBADF; if (f) { @@ -1444,7 +1416,7 @@ fput(f); } return error; -@@ -279,7 +286,7 @@ asmlinkage long sys_readlink(const char +@@ -279,7 +286,7 @@ error = -EINVAL; if (inode->i_op && inode->i_op->readlink && @@ -1453,23 +1425,13 @@ UPDATE_ATIME(inode); error = inode->i_op->readlink(nd.dentry, buf, bufsiz); } ---- linux-2.4.18-p4smp/fs/proc/base.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 12:20:46.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/fs/proc/base.c 2003-07-09 13:20:37.000000000 -0600 -@@ -465,6 +465,9 @@ static int proc_pid_follow_link(struct d +Index: linux-2.4.18-p4smp/include/linux/dcache.h +=================================================================== +--- linux-2.4.18-p4smp.orig/include/linux/dcache.h Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/include/linux/dcache.h Fri Jul 25 16:13:49 2003 +@@ -5,6 +5,51 @@ - error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt); - nd->last_type = LAST_BIND; -+ -+ if (nd->it != NULL) -+ nd->it->it_int_flags |= IT_FL_FOLLOWED; - out: - return error; - } ---- linux-2.4.18-p4smp/include/linux/dcache.h~vfs_intent-2.4.18-18-chaos65 2003-07-09 13:15:23.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/include/linux/dcache.h 2003-07-09 13:32:08.000000000 -0600 -@@ -6,6 +6,45 @@ #include - #include #include +#include + @@ -1488,18 +1450,24 @@ + +#define INTENT_MAGIC 0x19620323 + -+struct lookup_intent { -+ int it_op; -+ void (*it_op_release)(struct lookup_intent *); -+ int it_magic; -+ int it_mode; -+ int it_flags; -+ int it_disposition; -+ int it_status; ++ ++struct lustre_intent_data { ++ int it_disposition; ++ int it_status; ++ __u64 it_lock_handle; ++ void *it_data; ++ int it_lock_mode; + int it_int_flags; -+ __u64 it_lock_handle[2]; -+ int it_lock_mode; -+ void *it_data; ++}; ++struct lookup_intent { ++ int it_magic; ++ void (*it_op_release)(struct lookup_intent *); ++ int it_op; ++ int it_flags; ++ int it_create_mode; ++ union { ++ struct lustre_intent_data lustre; ++ } d; +}; + +static inline void intent_init(struct lookup_intent *it, int op, int flags) @@ -1513,7 +1481,7 @@ /* * linux/include/linux/dcache.h -@@ -92,8 +131,22 @@ struct dentry_operations { +@@ -91,8 +136,22 @@ int (*d_delete)(struct dentry *); void (*d_release)(struct dentry *); void (*d_iput)(struct dentry *, struct inode *); @@ -1536,7 +1504,7 @@ /* the dentry parameter passed to d_hash and d_compare is the parent * directory of the entries to be compared. It is used in case these * functions need any directory specific information for determining -@@ -125,6 +178,7 @@ d_iput: no no yes +@@ -124,6 +183,7 @@ * s_nfsd_free_path semaphore will be down */ #define DCACHE_REFERENCED 0x0008 /* Recently used, don't discard. */ @@ -1544,9 +1512,11 @@ extern spinlock_t dcache_lock; ---- linux-2.4.18-p4smp/include/linux/fs.h~vfs_intent-2.4.18-18-chaos65 2003-07-08 14:41:47.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/include/linux/fs.h 2003-07-08 14:45:17.000000000 -0600 -@@ -339,6 +339,9 @@ extern void set_bh_page(struct buffer_he +Index: linux-2.4.18-p4smp/include/linux/fs.h +=================================================================== +--- linux-2.4.18-p4smp.orig/include/linux/fs.h Fri Jul 25 16:13:48 2003 ++++ linux-2.4.18-p4smp/include/linux/fs.h Fri Jul 25 16:13:49 2003 +@@ -339,6 +339,9 @@ #define ATTR_MTIME_SET 256 #define ATTR_FORCE 512 /* Not a change, but a change it */ #define ATTR_ATTR_FLAG 1024 @@ -1556,7 +1526,7 @@ /* * This is the Inode Attributes structure, used for notify_change(). It -@@ -578,6 +580,7 @@ struct file { +@@ -578,6 +581,7 @@ /* needed for tty driver, and maybe others */ void *private_data; @@ -1564,15 +1534,15 @@ /* preallocated helper kiobuf to speedup O_DIRECT */ struct kiobuf *f_iobuf; -@@ -707,6 +710,7 @@ struct nameidata { +@@ -707,6 +711,7 @@ struct qstr last; unsigned int flags; int last_type; -+ struct lookup_intent *it; ++ struct lookup_intent *intent; }; #define DQUOT_USR_ENABLED 0x01 /* User diskquotas enabled */ -@@ -840,7 +844,8 @@ extern int vfs_symlink(struct inode *, s +@@ -840,7 +845,8 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *); extern int vfs_rmdir(struct inode *, struct dentry *); extern int vfs_unlink(struct inode *, struct dentry *); @@ -1582,7 +1552,7 @@ /* * File types -@@ -900,21 +905,34 @@ struct file_operations { +@@ -900,21 +906,34 @@ struct inode_operations { int (*create) (struct inode *,struct dentry *,int); @@ -1617,7 +1587,7 @@ int (*getattr) (struct dentry *, struct iattr *); }; -@@ -1119,10 +1137,12 @@ static inline int get_lease(struct inode +@@ -1119,10 +1138,12 @@ asmlinkage long sys_open(const char *, int, int); asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ @@ -1631,7 +1601,7 @@ extern int filp_close(struct file *, fl_owner_t id); extern char * getname(const char *); -@@ -1388,9 +1408,12 @@ typedef int (*read_actor_t)(read_descrip +@@ -1388,9 +1409,12 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin); extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); @@ -1644,7 +1614,7 @@ extern int FASTCALL(link_path_walk(const char *, struct nameidata *)); extern void path_release(struct nameidata *); extern int follow_down(struct vfsmount **, struct dentry **); -@@ -1399,6 +1422,8 @@ extern struct dentry * lookup_one_len(co +@@ -1399,6 +1423,8 @@ extern struct dentry * lookup_hash(struct qstr *, struct dentry *); #define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd) #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd) @@ -1653,7 +1623,7 @@ extern void inode_init_once(struct inode *); extern void iput(struct inode *); -@@ -1499,6 +1524,8 @@ extern struct file_operations generic_ro +@@ -1499,6 +1525,8 @@ extern int vfs_readlink(struct dentry *, char *, int, const char *); extern int vfs_follow_link(struct nameidata *, const char *); @@ -1662,9 +1632,11 @@ 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.18-p4smp/kernel/fork.c~vfs_intent-2.4.18-18-chaos65 2003-03-24 11:22:37.000000000 -0700 -+++ linux-2.4.18-p4smp-braam/kernel/fork.c 2003-07-09 13:20:37.000000000 -0600 -@@ -399,10 +399,13 @@ static inline struct fs_struct *__copy_f +Index: linux-2.4.18-p4smp/kernel/fork.c +=================================================================== +--- linux-2.4.18-p4smp.orig/kernel/fork.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/kernel/fork.c Fri Jul 25 16:13:49 2003 +@@ -399,10 +399,13 @@ fs->umask = old->umask; read_lock(&old->lock); fs->rootmnt = mntget(old->rootmnt); @@ -1678,9 +1650,11 @@ fs->altrootmnt = mntget(old->altrootmnt); fs->altroot = dget(old->altroot); } else { ---- linux-2.4.18-p4smp/kernel/exit.c~vfs_intent-2.4.18-18-chaos65 2002-10-29 12:27:38.000000000 -0700 -+++ linux-2.4.18-p4smp-braam/kernel/exit.c 2003-07-09 13:20:37.000000000 -0600 -@@ -303,11 +303,14 @@ static inline void __put_fs_struct(struc +Index: linux-2.4.18-p4smp/kernel/exit.c +=================================================================== +--- linux-2.4.18-p4smp.orig/kernel/exit.c Fri Jul 25 16:12:35 2003 ++++ linux-2.4.18-p4smp/kernel/exit.c Fri Jul 25 16:13:49 2003 +@@ -303,11 +303,14 @@ { /* No need to hold fs->lock if we are killing it */ if (atomic_dec_and_test(&fs->count)) { @@ -1695,9 +1669,11 @@ dput(fs->altroot); mntput(fs->altrootmnt); } ---- linux-2.4.18-p4smp/kernel/ksyms.c~vfs_intent-2.4.18-18-chaos65 2003-07-09 13:20:35.000000000 -0600 -+++ linux-2.4.18-p4smp-braam/kernel/ksyms.c 2003-07-09 13:20:37.000000000 -0600 -@@ -294,6 +294,7 @@ EXPORT_SYMBOL(read_cache_page); +Index: linux-2.4.18-p4smp/kernel/ksyms.c +=================================================================== +--- linux-2.4.18-p4smp.orig/kernel/ksyms.c Fri Jul 25 16:13:48 2003 ++++ linux-2.4.18-p4smp/kernel/ksyms.c Fri Jul 25 16:13:49 2003 +@@ -294,6 +294,7 @@ EXPORT_SYMBOL(set_page_dirty); EXPORT_SYMBOL(vfs_readlink); EXPORT_SYMBOL(vfs_follow_link); @@ -1705,5 +1681,3 @@ EXPORT_SYMBOL(page_readlink); EXPORT_SYMBOL(page_follow_link); EXPORT_SYMBOL(page_symlink_inode_operations); - -_ -- 1.8.3.1