From 4570d027140d64981cd5c552222ebe850cd4ccab Mon Sep 17 00:00:00 2001
From: braam <braam>
Date: Sat, 26 Jul 2003 00:05:32 +0000
Subject: [PATCH] define the it_flags correctly

---
 .../patches/vfs_intent-2.4.18-18-chaos65.patch     | 293 +++++++++++----------
 1 file changed, 150 insertions(+), 143 deletions(-)

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 f8413f6..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,11 +12,11 @@
  kernel/ksyms.c         |    1 
  12 files changed, 564 insertions(+), 99 deletions(-)
 
-Index: linux/fs/exec.c
+Index: linux-2.4.18-p4smp/fs/exec.c
 ===================================================================
---- linux.orig/fs/exec.c	2003-07-25 12:23:57.000000000 -0600
-+++ linux/fs/exec.c	2003-07-25 12:27:53.000000000 -0600
-@@ -117,8 +117,9 @@ asmlinkage long sys_uselib(const char * 
+--- 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;
@@ -27,7 +27,7 @@ Index: linux/fs/exec.c
  	if (error)
  		goto out;
  
-@@ -130,7 +131,8 @@ asmlinkage long sys_uselib(const char * 
+@@ -130,7 +131,8 @@
  	if (error)
  		goto exit;
  
@@ -37,7 +37,7 @@ Index: linux/fs/exec.c
  	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;
@@ -48,7 +48,7 @@ Index: linux/fs/exec.c
  	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) {
@@ -58,7 +58,7 @@ Index: linux/fs/exec.c
  				if (!IS_ERR(file)) {
  					err = deny_write_access(file);
  					if (err) {
-@@ -384,6 +388,7 @@ out:
+@@ -384,6 +388,7 @@
  				return file;
  			}
  		}
@@ -66,7 +66,7 @@ Index: linux/fs/exec.c
  		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;
@@ -75,11 +75,11 @@ Index: linux/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-Index: linux/fs/dcache.c
+Index: linux-2.4.18-p4smp/fs/dcache.c
 ===================================================================
---- linux.orig/fs/dcache.c	2003-07-25 12:23:57.000000000 -0600
-+++ linux/fs/dcache.c	2003-07-25 12:27:53.000000000 -0600
-@@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry)
+--- 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;
  	}
@@ -93,7 +93,7 @@ Index: linux/fs/dcache.c
  	/*
  	 * 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.
   */
   
@@ -116,11 +116,11 @@ Index: linux/fs/dcache.c
  }
  
  #define do_switch(x,y) do { \
-Index: linux/fs/namespace.c
+Index: linux-2.4.18-p4smp/fs/namespace.c
 ===================================================================
---- linux.orig/fs/namespace.c	2002-06-25 22:16:14.000000000 -0600
-+++ linux/fs/namespace.c	2003-07-25 12:27:53.000000000 -0600
-@@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount *
+--- 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;
@@ -128,7 +128,7 @@ Index: linux/fs/namespace.c
  	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);
@@ -136,7 +136,7 @@ Index: linux/fs/namespace.c
  	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;
@@ -156,7 +156,7 @@ Index: linux/fs/namespace.c
  
  	down_write(&current->namespace->sem);
  	err = -EINVAL;
-@@ -515,6 +520,7 @@ static int do_loopback(struct nameidata 
+@@ -515,6 +520,7 @@
  	}
  
  	up_write(&current->namespace->sem);
@@ -164,7 +164,7 @@ Index: linux/fs/namespace.c
  	path_release(&old_nd);
  	return err;
  }
-@@ -698,6 +704,7 @@ long do_mount(char * dev_name, char * di
+@@ -698,6 +704,7 @@
  		  unsigned long flags, void *data_page)
  {
  	struct nameidata nd;
@@ -172,7 +172,7 @@ Index: linux/fs/namespace.c
  	int retval = 0;
  	int mnt_flags = 0;
  
-@@ -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 */
@@ -187,7 +187,7 @@ Index: linux/fs/namespace.c
  	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);
@@ -196,7 +196,7 @@ Index: linux/fs/namespace.c
  	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;
@@ -205,7 +205,7 @@ Index: linux/fs/namespace.c
  	int error;
  
  	if (!capable(CAP_SYS_ADMIN))
-@@ -908,14 +920,14 @@ asmlinkage long sys_pivot_root(const cha
+@@ -908,14 +920,14 @@
  
  	lock_kernel();
  
@@ -222,7 +222,7 @@ Index: linux/fs/namespace.c
  	if (error)
  		goto out1;
  
-@@ -970,8 +982,10 @@ out2:
+@@ -970,8 +982,10 @@
  	up(&old_nd.dentry->d_inode->i_zombie);
  	up_write(&current->namespace->sem);
  	path_release(&user_nd);
@@ -233,10 +233,10 @@ Index: linux/fs/namespace.c
  	path_release(&new_nd);
  out0:
  	unlock_kernel();
-Index: linux/fs/namei.c
+Index: linux-2.4.18-p4smp/fs/namei.c
 ===================================================================
---- linux.orig/fs/namei.c	2003-07-25 12:23:57.000000000 -0600
-+++ linux/fs/namei.c	2003-07-25 12:47:56.000000000 -0600
+--- 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...
   */
@@ -251,7 +251,7 @@ Index: linux/fs/namei.c
  /* 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
   */
@@ -272,7 +272,7 @@ Index: linux/fs/namei.c
  	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
   */
@@ -288,7 +288,7 @@ Index: linux/fs/namei.c
  	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();
@@ -298,7 +298,7 @@ Index: linux/fs/namei.c
  			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);
  		}
@@ -311,7 +311,7 @@ Index: linux/fs/namei.c
  	}
  	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. 
   */
@@ -321,7 +321,7 @@ Index: linux/fs/namei.c
  {
  	int err;
  	if (current->link_count >= max_recursive_link)
-@@ -348,10 +377,12 @@ static inline int do_follow_link(struct 
+@@ -348,10 +377,12 @@
  	current->link_count++;
  	current->total_link_count++;
  	UPDATE_ATIME(dentry->d_inode);
@@ -335,7 +335,7 @@ Index: linux/fs/namei.c
  	path_release(nd);
  	return -ELOOP;
  }
-@@ -381,7 +412,8 @@ int follow_up(struct vfsmount **mnt, str
+@@ -381,7 +412,8 @@
  	return __follow_up(mnt, dentry);
  }
  
@@ -345,7 +345,7 @@ Index: linux/fs/namei.c
  {
  	struct vfsmount *mounted;
  
-@@ -401,7 +433,7 @@ static inline int __follow_down(struct v
+@@ -401,7 +433,7 @@
  
  int follow_down(struct vfsmount **mnt, struct dentry **dentry)
  {
@@ -354,7 +354,7 @@ Index: linux/fs/namei.c
  }
   
  static inline void follow_dotdot(struct nameidata *nd)
-@@ -437,7 +469,7 @@ static inline void follow_dotdot(struct 
+@@ -437,7 +469,7 @@
  		mntput(nd->mnt);
  		nd->mnt = parent;
  	}
@@ -363,7 +363,7 @@ Index: linux/fs/namei.c
  		;
  }
  
-@@ -449,7 +481,8 @@ static inline void follow_dotdot(struct 
+@@ -449,7 +481,8 @@
   *
   * We expect 'base' to be positive and a directory.
   */
@@ -373,7 +373,7 @@ Index: linux/fs/namei.c
  {
  	struct dentry *dentry;
  	struct inode *inode;
-@@ -526,18 +559,18 @@ int link_path_walk(const char * name, st
+@@ -526,18 +559,18 @@
  				break;
  		}
  		/* This does the actual lookups.. */
@@ -395,7 +395,7 @@ Index: linux/fs/namei.c
  			;
  
  		err = -ENOENT;
-@@ -548,8 +581,8 @@ int link_path_walk(const char * name, st
+@@ -548,8 +581,8 @@
  		if (!inode->i_op)
  			goto out_dput;
  
@@ -406,7 +406,7 @@ Index: linux/fs/namei.c
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -565,7 +598,7 @@ int link_path_walk(const char * name, st
+@@ -565,7 +598,7 @@
  			nd->dentry = dentry;
  		}
  		err = -ENOTDIR; 
@@ -415,7 +415,7 @@ Index: linux/fs/namei.c
  			break;
  		continue;
  		/* here ends the main loop */
-@@ -592,22 +625,23 @@ last_component:
+@@ -592,22 +625,23 @@
  			if (err < 0)
  				break;
  		}
@@ -444,7 +444,7 @@ Index: linux/fs/namei.c
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -621,7 +655,8 @@ last_component:
+@@ -621,7 +655,8 @@
  			goto no_inode;
  		if (lookup_flags & LOOKUP_DIRECTORY) {
  			err = -ENOTDIR; 
@@ -454,7 +454,7 @@ Index: linux/fs/namei.c
  				break;
  		}
  		goto return_base;
-@@ -645,7 +680,24 @@ return_reval:
+@@ -645,7 +680,24 @@
  		 * Check the cached dentry for staleness.
  		 */
  		dentry = nd->dentry;
@@ -480,7 +480,7 @@ Index: linux/fs/namei.c
  			err = -ESTALE;
  			if (!dentry->d_op->d_revalidate(dentry, 0)) {
  				d_invalidate(dentry);
-@@ -658,15 +710,28 @@ out_dput:
+@@ -658,15 +710,28 @@
  		dput(dentry);
  		break;
  	}
@@ -510,7 +510,7 @@ Index: linux/fs/namei.c
  }
  
  /* SMP-safe */
-@@ -751,6 +816,17 @@ walk_init_root(const char *name, struct 
+@@ -751,6 +816,17 @@
  }
  
  /* SMP-safe */
@@ -528,7 +528,7 @@ Index: linux/fs/namei.c
  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
  {
  	int error = 0;
-@@ -765,6 +841,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;
@@ -536,7 +536,7 @@ Index: linux/fs/namei.c
  	if (*name=='/')
  		return walk_init_root(name,nd);
  	read_lock(&current->fs->lock);
-@@ -779,7 +856,8 @@ int path_init(const char *name, unsigned
+@@ -779,7 +856,8 @@
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -546,7 +546,7 @@ Index: linux/fs/namei.c
  {
  	struct dentry * dentry;
  	struct inode *inode;
-@@ -802,13 +880,16 @@ struct dentry * lookup_hash(struct qstr 
+@@ -802,13 +880,16 @@
  			goto out;
  	}
  
@@ -564,7 +564,7 @@ Index: linux/fs/namei.c
  		dentry = inode->i_op->lookup(inode, new);
  		unlock_kernel();
  		if (!dentry)
-@@ -820,6 +901,12 @@ out:
+@@ -820,6 +901,12 @@
  	return dentry;
  }
  
@@ -577,7 +577,7 @@ Index: linux/fs/namei.c
  /* SMP-safe */
  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
  {
-@@ -841,7 +928,7 @@ struct dentry * lookup_one_len(const cha
+@@ -841,7 +928,7 @@
  	}
  	this.hash = end_name_hash(hash);
  
@@ -586,7 +586,7 @@ Index: linux/fs/namei.c
  access:
  	return ERR_PTR(-EACCES);
  }
-@@ -872,6 +959,23 @@ int __user_walk(const char *name, unsign
+@@ -872,6 +959,23 @@
  	return err;
  }
  
@@ -610,7 +610,7 @@ Index: linux/fs/namei.c
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -969,6 +1073,37 @@ static inline int lookup_flags(unsigned 
+@@ -969,6 +1073,37 @@
  	return retval;
  }
  
@@ -648,7 +648,7 @@ Index: linux/fs/namei.c
  int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
  {
  	int error;
-@@ -1045,14 +1180,17 @@ int may_open(struct nameidata *nd, int a
+@@ -1045,14 +1180,17 @@
          return get_lease(inode, flag);
  }
  
@@ -663,11 +663,18 @@ Index: linux/fs/namei.c
  	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 +1207,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)) {
@@ -676,7 +683,7 @@ Index: linux/fs/namei.c
  		if (error)
  			return ERR_PTR(error);
  		dentry = nd.dentry;
-@@ -1079,6 +1217,8 @@ struct file *filp_open(const char * path
+@@ -1079,6 +1218,8 @@
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -685,7 +692,7 @@ Index: linux/fs/namei.c
  	error = path_lookup(pathname, LOOKUP_PARENT, &nd);
  	if (error)
  		return ERR_PTR(error);
-@@ -1094,7 +1234,7 @@ struct file *filp_open(const char * path
+@@ -1094,7 +1235,7 @@
  
  	dir = nd.dentry;
  	down(&dir->d_inode->i_sem);
@@ -694,7 +701,7 @@ Index: linux/fs/namei.c
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1103,10 +1243,11 @@ do_last:
+@@ -1103,10 +1244,11 @@
  		goto exit;
  	}
  
@@ -708,7 +715,7 @@ Index: linux/fs/namei.c
  		up(&dir->d_inode->i_sem);
  		dput(nd.dentry);
  		nd.dentry = dentry;
-@@ -1132,12 +1273,12 @@ do_last:
+@@ -1132,12 +1274,12 @@
  		error = -ELOOP;
  		if (flag & O_NOFOLLOW)
  			goto exit_dput;
@@ -723,7 +730,7 @@ Index: linux/fs/namei.c
  		goto do_link;
  
  	dput(nd.dentry);
-@@ -1152,11 +1293,13 @@ ok:
+@@ -1152,11 +1294,13 @@
  	if (!S_ISREG(nd.dentry->d_inode->i_mode))
  		open_flags &= ~O_TRUNC;
  
@@ -738,7 +745,7 @@ Index: linux/fs/namei.c
  	path_release(&nd);
  	return ERR_PTR(error);
  
-@@ -1175,10 +1318,14 @@ do_link:
+@@ -1175,10 +1319,14 @@
  	 * are done. Procfs-like symlinks just set LAST_BIND.
  	 */
  	UPDATE_ATIME(dentry->d_inode);
@@ -754,7 +761,7 @@ Index: linux/fs/namei.c
  	if (nd.last_type == LAST_BIND) {
  		dentry = nd.dentry;
  		goto ok;
-@@ -1197,13 +1344,15 @@ do_link:
+@@ -1197,13 +1345,15 @@
  	}
  	dir = nd.dentry;
  	down(&dir->d_inode->i_sem);
@@ -772,7 +779,7 @@ Index: linux/fs/namei.c
  {
  	struct dentry *dentry;
  
-@@ -1211,7 +1360,7 @@ static struct dentry *lookup_create(stru
+@@ -1211,7 +1361,7 @@
  	dentry = ERR_PTR(-EEXIST);
  	if (nd->last_type != LAST_NORM)
  		goto fail;
@@ -781,7 +788,7 @@ Index: linux/fs/namei.c
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1267,7 +1416,16 @@ asmlinkage long sys_mknod(const char * f
+@@ -1267,7 +1417,16 @@
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
@@ -799,7 +806,7 @@ Index: linux/fs/namei.c
  	error = PTR_ERR(dentry);
  
  	mode &= ~current->fs->umask;
-@@ -1288,6 +1446,7 @@ asmlinkage long sys_mknod(const char * f
+@@ -1288,6 +1447,7 @@
  		dput(dentry);
  	}
  	up(&nd.dentry->d_inode->i_sem);
@@ -807,7 +814,7 @@ Index: linux/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1335,7 +1494,14 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1335,7 +1495,14 @@
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
@@ -823,7 +830,7 @@ Index: linux/fs/namei.c
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
  			error = vfs_mkdir(nd.dentry->d_inode, dentry,
-@@ -1343,6 +1509,7 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1343,6 +1510,7 @@
  			dput(dentry);
  		}
  		up(&nd.dentry->d_inode->i_sem);
@@ -831,7 +838,7 @@ Index: linux/fs/namei.c
  		path_release(&nd);
  out:
  		putname(tmp);
-@@ -1443,8 +1610,16 @@ asmlinkage long sys_rmdir(const char * p
+@@ -1443,8 +1611,16 @@
  			error = -EBUSY;
  			goto exit1;
  	}
@@ -849,7 +856,7 @@ Index: linux/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1502,8 +1677,15 @@ asmlinkage long sys_unlink(const char * 
+@@ -1502,8 +1678,15 @@
  	error = -EISDIR;
  	if (nd.last_type != LAST_NORM)
  		goto exit1;
@@ -866,7 +873,7 @@ Index: linux/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1570,15 +1752,23 @@ asmlinkage long sys_symlink(const char *
+@@ -1570,15 +1753,23 @@
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
@@ -892,7 +899,7 @@ Index: linux/fs/namei.c
  		putname(to);
  	}
  	putname(from);
-@@ -1654,7 +1844,14 @@ asmlinkage long sys_link(const char * ol
+@@ -1654,7 +1845,14 @@
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
@@ -908,7 +915,7 @@ Index: linux/fs/namei.c
  		error = PTR_ERR(new_dentry);
  		if (!IS_ERR(new_dentry)) {
  			error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-@@ -1698,7 +1895,7 @@ exit:
+@@ -1698,7 +1896,7 @@
   *	   locking].
   */
  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
@@ -917,7 +924,7 @@ Index: linux/fs/namei.c
  {
  	int error;
  	struct inode *target;
-@@ -1777,7 +1974,7 @@ out_unlock:
+@@ -1777,7 +1975,7 @@
  }
  
  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
@@ -926,7 +933,7 @@ Index: linux/fs/namei.c
  {
  	int error;
  
-@@ -1865,9 +2062,18 @@ static inline int do_rename(const char *
+@@ -1865,9 +2063,18 @@
  	if (newnd.last_type != LAST_NORM)
  		goto exit2;
  
@@ -946,7 +953,7 @@ Index: linux/fs/namei.c
  	error = PTR_ERR(old_dentry);
  	if (IS_ERR(old_dentry))
  		goto exit3;
-@@ -1883,16 +2089,16 @@ static inline int do_rename(const char *
+@@ -1883,16 +2090,16 @@
  		if (newnd.last.name[newnd.last.len])
  			goto exit4;
  	}
@@ -965,7 +972,7 @@ Index: linux/fs/namei.c
  	dput(new_dentry);
  exit4:
  	dput(old_dentry);
-@@ -1943,12 +2149,17 @@ out:
+@@ -1943,12 +2150,17 @@
  }
  
  static inline int
@@ -984,7 +991,7 @@ Index: linux/fs/namei.c
  
  	if (*link == '/') {
  		path_release(nd);
-@@ -1956,7 +2167,7 @@ __vfs_follow_link(struct nameidata *nd, 
+@@ -1956,7 +2168,7 @@
  			/* weird __emul_prefix() stuff did it */
  			goto out;
  	}
@@ -993,7 +1000,7 @@ Index: linux/fs/namei.c
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
  		return res;
-@@ -1978,7 +2189,13 @@ fail:
+@@ -1978,7 +2190,13 @@
  
  int vfs_follow_link(struct nameidata *nd, const char *link)
  {
@@ -1008,7 +1015,7 @@ Index: linux/fs/namei.c
  }
  
  /* get the link contents into pagecache */
-@@ -2020,7 +2237,7 @@ int page_follow_link(struct dentry *dent
+@@ -2020,7 +2238,7 @@
  {
  	struct page *page = NULL;
  	char *s = page_getlink(dentry, &page);
@@ -1017,10 +1024,10 @@ Index: linux/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux/fs/open.c
+Index: linux-2.4.18-p4smp/fs/open.c
 ===================================================================
---- linux.orig/fs/open.c	2003-07-25 12:23:57.000000000 -0600
-+++ linux/fs/open.c	2003-07-25 12:27:53.000000000 -0600
+--- 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 <asm/uaccess.h>
  
@@ -1030,7 +1037,7 @@ Index: linux/fs/open.c
  
  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);
  }
  
@@ -1042,7 +1049,7 @@ Index: linux/fs/open.c
  	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;
@@ -1057,7 +1064,7 @@ Index: linux/fs/open.c
  	up(&inode->i_sem);
  	return error;
  }
-@@ -118,12 +127,13 @@ static inline long do_sys_truncate(const
+@@ -118,12 +127,13 @@
  	struct nameidata nd;
  	struct inode * inode;
  	int error;
@@ -1072,7 +1079,7 @@ Index: linux/fs/open.c
  	if (error)
  		goto out;
  	inode = nd.dentry->d_inode;
-@@ -163,11 +173,13 @@ static inline long do_sys_truncate(const
+@@ -163,11 +173,13 @@
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error) {
  		DQUOT_INIT(inode);
@@ -1087,7 +1094,7 @@ Index: linux/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -215,7 +227,7 @@ static inline long do_sys_ftruncate(unsi
+@@ -215,7 +227,7 @@
  
  	error = locks_verify_truncate(inode, file, length);
  	if (!error)
@@ -1096,7 +1103,7 @@ Index: linux/fs/open.c
  out_putf:
  	fput(file);
  out:
-@@ -260,11 +272,13 @@ asmlinkage long sys_utime(char * filenam
+@@ -260,11 +272,13 @@
  	struct inode * inode;
  	struct iattr newattrs;
  
@@ -1111,7 +1118,7 @@ Index: linux/fs/open.c
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
-@@ -279,11 +293,25 @@ asmlinkage long sys_utime(char * filenam
+@@ -279,11 +293,25 @@
  			goto dput_and_out;
  
  		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
@@ -1138,7 +1145,7 @@ Index: linux/fs/open.c
  	error = notify_change(nd.dentry, &newattrs);
  dput_and_out:
  	path_release(&nd);
-@@ -304,12 +332,14 @@ asmlinkage long sys_utimes(char * filena
+@@ -304,12 +332,14 @@
  	struct inode * inode;
  	struct iattr newattrs;
  
@@ -1154,7 +1161,7 @@ Index: linux/fs/open.c
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
-@@ -324,7 +354,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;
@@ -1176,7 +1183,7 @@ Index: linux/fs/open.c
  		if (current->fsuid != inode->i_uid &&
  		    (error = permission(inode,MAY_WRITE)) != 0)
  			goto dput_and_out;
-@@ -347,6 +390,7 @@ asmlinkage long sys_access(const char * 
+@@ -347,6 +390,7 @@
  	int old_fsuid, old_fsgid;
  	kernel_cap_t old_cap;
  	int res;
@@ -1184,7 +1191,7 @@ Index: linux/fs/open.c
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
-@@ -364,13 +408,14 @@ asmlinkage long sys_access(const char * 
+@@ -364,13 +408,14 @@
  	else
  		current->cap_effective = current->cap_permitted;
  
@@ -1200,7 +1207,7 @@ Index: linux/fs/open.c
  		path_release(&nd);
  	}
  
-@@ -385,8 +430,11 @@ asmlinkage long sys_chdir(const char * f
+@@ -385,8 +430,11 @@
  {
  	int error;
  	struct nameidata nd;
@@ -1213,7 +1220,7 @@ Index: linux/fs/open.c
  	if (error)
  		goto out;
  
-@@ -397,6 +445,7 @@ asmlinkage long sys_chdir(const char * f
+@@ -397,6 +445,7 @@
  	set_fs_pwd(current->fs, nd.mnt, nd.dentry);
  
  dput_and_out:
@@ -1221,7 +1228,7 @@ Index: linux/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -436,9 +485,10 @@ asmlinkage long sys_chroot(const char * 
+@@ -436,9 +485,10 @@
  {
  	int error;
  	struct nameidata nd;
@@ -1234,7 +1241,7 @@ Index: linux/fs/open.c
  	if (error)
  		goto out;
  
-@@ -454,6 +504,7 @@ asmlinkage long sys_chroot(const char * 
+@@ -454,6 +504,7 @@
  	set_fs_altroot();
  	error = 0;
  dput_and_out:
@@ -1242,7 +1249,7 @@ Index: linux/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -508,6 +559,18 @@ asmlinkage long sys_chmod(const char * f
+@@ -508,6 +559,18 @@
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
  
@@ -1261,7 +1268,7 @@ Index: linux/fs/open.c
  	error = -EPERM;
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto dput_and_out;
-@@ -538,6 +601,20 @@ static int chown_common(struct dentry * 
+@@ -538,6 +601,20 @@
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto out;
@@ -1282,7 +1289,7 @@ Index: linux/fs/open.c
  	error = -EPERM;
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto out;
-@@ -628,7 +705,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
  
@@ -1292,7 +1299,7 @@ Index: linux/fs/open.c
  {
  	struct file * f;
  	struct inode *inode;
-@@ -649,7 +727,7 @@ struct file *dentry_open(struct dentry *
+@@ -649,7 +727,7 @@
  		error = locks_verify_locked(inode);
  		if (!error) {
  			DQUOT_INIT(inode);
@@ -1301,7 +1308,7 @@ Index: linux/fs/open.c
  		}
  		if (error || !(f->f_mode & FMODE_WRITE))
  			put_write_access(inode);
-@@ -679,7 +757,9 @@ struct file *dentry_open(struct dentry *
+@@ -679,7 +757,9 @@
  	}
  
  	if (f->f_op && f->f_op->open) {
@@ -1311,7 +1318,7 @@ Index: linux/fs/open.c
  		if (error)
  			goto cleanup_all;
  	}
-@@ -693,6 +773,7 @@ struct file *dentry_open(struct dentry *
+@@ -693,6 +773,7 @@
  		do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT);
  	
  
@@ -1319,7 +1326,7 @@ Index: linux/fs/open.c
  	return f;
  
  cleanup_all:
-@@ -707,11 +788,17 @@ cleanup_all:
+@@ -707,11 +788,17 @@
  cleanup_file:
  	put_filp(f);
  cleanup_dentry:
@@ -1337,10 +1344,10 @@ Index: linux/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux/fs/stat.c
+Index: linux-2.4.18-p4smp/fs/stat.c
 ===================================================================
---- linux.orig/fs/stat.c	2003-07-25 12:23:57.000000000 -0600
-+++ linux/fs/stat.c	2003-07-25 12:27:53.000000000 -0600
+--- 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.
   */
@@ -1370,7 +1377,7 @@ Index: linux/fs/stat.c
  	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;
@@ -1385,7 +1392,7 @@ Index: linux/fs/stat.c
  		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;
@@ -1400,7 +1407,7 @@ Index: linux/fs/stat.c
  		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) {
@@ -1409,7 +1416,7 @@ Index: linux/fs/stat.c
  		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 &&
@@ -1418,10 +1425,10 @@ Index: linux/fs/stat.c
  			UPDATE_ATIME(inode);
  			error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
  		}
-Index: linux/include/linux/dcache.h
+Index: linux-2.4.18-p4smp/include/linux/dcache.h
 ===================================================================
---- linux.orig/include/linux/dcache.h	2003-07-25 12:23:57.000000000 -0600
-+++ linux/include/linux/dcache.h	2003-07-25 12:30:51.000000000 -0600
+--- 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 @@
  
  #include <asm/atomic.h>
@@ -1474,7 +1481,7 @@ Index: linux/include/linux/dcache.h
  
  /*
   * linux/include/linux/dcache.h
-@@ -91,8 +136,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 *);
@@ -1497,7 +1504,7 @@ Index: linux/include/linux/dcache.h
  /* 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
-@@ -124,6 +183,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. */
@@ -1505,11 +1512,11 @@ Index: linux/include/linux/dcache.h
  
  extern spinlock_t dcache_lock;
  
-Index: linux/include/linux/fs.h
+Index: linux-2.4.18-p4smp/include/linux/fs.h
 ===================================================================
---- linux.orig/include/linux/fs.h	2003-07-25 12:27:53.000000000 -0600
-+++ linux/include/linux/fs.h	2003-07-25 12:36:55.000000000 -0600
-@@ -338,6 +338,9 @@ extern void set_bh_page(struct buffer_he
+--- 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
@@ -1519,7 +1526,7 @@ Index: linux/include/linux/fs.h
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -576,6 +579,7 @@ struct file {
+@@ -578,6 +581,7 @@
  
  	/* needed for tty driver, and maybe others */
  	void			*private_data;
@@ -1527,7 +1534,7 @@ Index: linux/include/linux/fs.h
  
  	/* preallocated helper kiobuf to speedup O_DIRECT */
  	struct kiobuf		*f_iobuf;
-@@ -705,6 +709,7 @@ struct nameidata {
+@@ -707,6 +711,7 @@
  	struct qstr last;
  	unsigned int flags;
  	int last_type;
@@ -1535,7 +1542,7 @@ Index: linux/include/linux/fs.h
  };
  
  #define DQUOT_USR_ENABLED	0x01		/* User diskquotas enabled */
-@@ -836,7 +841,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 *);
@@ -1545,7 +1552,7 @@ Index: linux/include/linux/fs.h
  
  /*
   * File types
-@@ -896,21 +902,34 @@ struct file_operations {
+@@ -900,21 +906,34 @@
  
  struct inode_operations {
  	int (*create) (struct inode *,struct dentry *,int);
@@ -1580,7 +1587,7 @@ Index: linux/include/linux/fs.h
  	int (*getattr) (struct dentry *, struct iattr *);
  };
  
-@@ -1115,10 +1134,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 */
@@ -1594,7 +1601,7 @@ Index: linux/include/linux/fs.h
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char *);
  
-@@ -1384,9 +1405,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 *));
@@ -1607,7 +1614,7 @@ Index: linux/include/linux/fs.h
  extern int FASTCALL(link_path_walk(const char *, struct nameidata *));
  extern void path_release(struct nameidata *);
  extern int follow_down(struct vfsmount **, struct dentry **);
-@@ -1395,6 +1419,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)
@@ -1616,7 +1623,7 @@ Index: linux/include/linux/fs.h
  
  extern void inode_init_once(struct inode *);
  extern void iput(struct inode *);
-@@ -1495,6 +1521,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 *);
@@ -1625,11 +1632,11 @@ Index: linux/include/linux/fs.h
  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;
-Index: linux/kernel/fork.c
+Index: linux-2.4.18-p4smp/kernel/fork.c
 ===================================================================
---- linux.orig/kernel/fork.c	2003-03-24 11:22:37.000000000 -0700
-+++ linux/kernel/fork.c	2003-07-25 12:27:53.000000000 -0600
-@@ -399,10 +399,13 @@ static inline struct fs_struct *__copy_f
+--- 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);
@@ -1643,11 +1650,11 @@ Index: linux/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux/kernel/exit.c
+Index: linux-2.4.18-p4smp/kernel/exit.c
 ===================================================================
---- linux.orig/kernel/exit.c	2002-10-29 12:27:38.000000000 -0700
-+++ linux/kernel/exit.c	2003-07-25 12:27:53.000000000 -0600
-@@ -303,11 +303,14 @@ static inline void __put_fs_struct(struc
+--- 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)) {
@@ -1662,11 +1669,11 @@ Index: linux/kernel/exit.c
  			dput(fs->altroot);
  			mntput(fs->altrootmnt);
  		}
-Index: linux/kernel/ksyms.c
+Index: linux-2.4.18-p4smp/kernel/ksyms.c
 ===================================================================
---- linux.orig/kernel/ksyms.c	2003-07-25 12:27:53.000000000 -0600
-+++ linux/kernel/ksyms.c	2003-07-25 12:27:53.000000000 -0600
-@@ -294,6 +294,7 @@ EXPORT_SYMBOL(read_cache_page);
+--- 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);
-- 
1.8.3.1