From b7ed986d8d32ecb7c98c9a3f0627f77e2d1ee50f Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Fri, 19 Mar 2004 21:20:26 +0000
Subject: [PATCH] b=2399, 2325, 2805

new kernel patches for chaos-2.4.18 that were committed on other
series files earlier
---
 .../patches/vfs_intent-2.4.18-18-chaos65.patch     | 312 ++++++++++++---------
 lustre/kernel_patches/series/chaos-2.4.18          |   2 +
 2 files changed, 176 insertions(+), 138 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 e29ae29..5e9fee3 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
@@ -11,9 +11,11 @@
  kernel/ksyms.c         |    1 
  11 files changed, 564 insertions(+), 126 deletions(-)
 
---- linux-2.4.18-chaos/fs/exec.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:03.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/exec.c	2003-09-14 17:25:41.000000000 +0400
-@@ -117,8 +117,10 @@ asmlinkage long sys_uselib(const char * 
+Index: linux-2.4.18-p4smp/fs/exec.c
+===================================================================
+--- linux-2.4.18-p4smp.orig/fs/exec.c	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/fs/exec.c	2004-03-19 16:05:42.000000000 -0500
+@@ -117,8 +117,10 @@
  	struct file * file;
  	struct nameidata nd;
  	int error;
@@ -25,7 +27,7 @@
  	if (error)
  		goto out;
  
-@@ -130,7 +132,8 @@ asmlinkage long sys_uselib(const char * 
+@@ -130,7 +132,8 @@
  	if (error)
  		goto exit;
  
@@ -35,7 +37,7 @@
  	error = PTR_ERR(file);
  	if (IS_ERR(file))
  		goto out;
-@@ -359,8 +362,9 @@ struct file *open_exec(const char *name)
+@@ -359,8 +362,9 @@
  	struct inode *inode;
  	struct file *file;
  	int err = 0;
@@ -47,7 +49,7 @@
  	file = ERR_PTR(err);
  	if (!err) {
  		inode = nd.dentry->d_inode;
-@@ -372,7 +376,8 @@ struct file *open_exec(const char *name)
+@@ -372,7 +376,8 @@
  				err = -EACCES;
  			file = ERR_PTR(err);
  			if (!err) {
@@ -57,7 +59,7 @@
  				if (!IS_ERR(file)) {
  					err = deny_write_access(file);
  					if (err) {
-@@ -384,6 +389,7 @@ out:
+@@ -384,6 +389,7 @@
  				return file;
  			}
  		}
@@ -65,7 +67,7 @@
  		path_release(&nd);
  	}
  	goto out;
-@@ -1104,7 +1110,7 @@ int do_coredump(long signr, struct pt_re
+@@ -1104,7 +1110,7 @@
  		goto close_fail;
  	if (!file->f_op->write)
  		goto close_fail;
@@ -74,9 +76,11 @@
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
---- linux-2.4.18-chaos/fs/dcache.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:03.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/dcache.c	2003-09-14 17:25:41.000000000 +0400
-@@ -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	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/fs/dcache.c	2004-03-19 16:05:42.000000000 -0500
+@@ -186,6 +186,13 @@
  		spin_unlock(&dcache_lock);
  		return 0;
  	}
@@ -90,7 +94,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.
   */
   
@@ -113,9 +117,11 @@
  }
  
  #define do_switch(x,y) do { \
---- linux-2.4.18-chaos/fs/namespace.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:05.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/namespace.c	2003-09-14 17:25:41.000000000 +0400
-@@ -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	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/fs/namespace.c	2004-03-19 16:05:42.000000000 -0500
+@@ -99,6 +99,7 @@
  {
  	old_nd->dentry = mnt->mnt_mountpoint;
  	old_nd->mnt = mnt->mnt_parent;
@@ -123,7 +129,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);
@@ -131,7 +137,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;
@@ -151,7 +157,7 @@
  
  	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);
@@ -159,7 +165,7 @@
  	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;
@@ -167,7 +173,7 @@
  	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 */
@@ -182,7 +188,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);
@@ -191,7 +197,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;
@@ -200,7 +206,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();
  
@@ -217,7 +223,7 @@
  	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);
@@ -228,8 +234,10 @@
  	path_release(&new_nd);
  out0:
  	unlock_kernel();
---- linux-2.4.18-chaos/fs/namei.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:05.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/namei.c	2003-09-14 17:25:41.000000000 +0400
+Index: linux-2.4.18-p4smp/fs/namei.c
+===================================================================
+--- linux-2.4.18-p4smp.orig/fs/namei.c	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/fs/namei.c	2004-03-19 16:06:19.000000000 -0500
 @@ -94,6 +94,13 @@
   * XEmacs seems to be relying on it...
   */
@@ -244,7 +252,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
   */
@@ -265,7 +273,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,15 @@ static struct dentry * cached_lookup(str
+@@ -281,11 +297,15 @@
   * make sure that nobody added the entry to the dcache in the meantime..
   * SMP-safe
   */
@@ -282,7 +290,7 @@
  	down(&dir->i_sem);
  	/*
  	 * First re-do the cached lookup just in case it was created
-@@ -300,6 +320,9 @@ static struct dentry * real_lookup(struc
+@@ -300,6 +320,9 @@
  		result = ERR_PTR(-ENOMEM);
  		if (dentry) {
  			lock_kernel();
@@ -292,7 +300,7 @@
  			result = dir->i_op->lookup(dir, dentry);
  			unlock_kernel();
  			if (result)
-@@ -321,6 +344,15 @@ static struct dentry * real_lookup(struc
+@@ -321,6 +344,15 @@
  			dput(result);
  			result = ERR_PTR(-ENOENT);
  		}
@@ -308,7 +316,7 @@
  	}
  	return result;
  }
-@@ -334,7 +366,8 @@ int max_recursive_link = 5;
+@@ -334,7 +366,8 @@
   * Without that kind of total limit, nasty chains of consecutive
   * symlinks can cause almost arbitrarily long lookups. 
   */
@@ -318,7 +326,7 @@
  {
  	int err;
  	if (current->link_count >= max_recursive_link)
-@@ -348,10 +381,12 @@ static inline int do_follow_link(struct 
+@@ -348,10 +381,12 @@
  	current->link_count++;
  	current->total_link_count++;
  	UPDATE_ATIME(dentry->d_inode);
@@ -331,7 +339,7 @@
  	path_release(nd);
  	return -ELOOP;
  }
-@@ -381,7 +416,8 @@ int follow_up(struct vfsmount **mnt, str
+@@ -381,7 +416,8 @@
  	return __follow_up(mnt, dentry);
  }
  
@@ -341,7 +349,7 @@
  {
  	struct vfsmount *mounted;
  
-@@ -401,7 +437,7 @@ static inline int __follow_down(struct v
+@@ -401,7 +437,7 @@
  
  int follow_down(struct vfsmount **mnt, struct dentry **dentry)
  {
@@ -350,7 +358,7 @@
  }
   
  static inline void follow_dotdot(struct nameidata *nd)
-@@ -437,7 +473,7 @@ static inline void follow_dotdot(struct 
+@@ -437,7 +473,7 @@
  		mntput(nd->mnt);
  		nd->mnt = parent;
  	}
@@ -359,7 +367,7 @@
  		;
  }
  
-@@ -449,7 +485,8 @@ static inline void follow_dotdot(struct 
+@@ -449,7 +485,8 @@
   *
   * We expect 'base' to be positive and a directory.
   */
@@ -369,7 +377,7 @@
  {
  	struct dentry *dentry;
  	struct inode *inode;
-@@ -526,18 +563,18 @@ int link_path_walk(const char * name, st
+@@ -526,18 +563,18 @@
  				break;
  		}
  		/* This does the actual lookups.. */
@@ -391,7 +399,7 @@
  			;
  
  		err = -ENOENT;
-@@ -548,8 +585,8 @@ int link_path_walk(const char * name, st
+@@ -548,8 +585,8 @@
  		if (!inode->i_op)
  			goto out_dput;
  
@@ -402,7 +410,7 @@
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -565,7 +602,7 @@ int link_path_walk(const char * name, st
+@@ -565,7 +602,7 @@
  			nd->dentry = dentry;
  		}
  		err = -ENOTDIR; 
@@ -411,7 +419,7 @@
  			break;
  		continue;
  		/* here ends the main loop */
-@@ -592,22 +629,23 @@ last_component:
+@@ -592,22 +629,23 @@
  			if (err < 0)
  				break;
  		}
@@ -440,7 +448,7 @@
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -621,7 +659,8 @@ last_component:
+@@ -621,7 +659,8 @@
  			goto no_inode;
  		if (lookup_flags & LOOKUP_DIRECTORY) {
  			err = -ENOTDIR; 
@@ -450,7 +458,7 @@
  				break;
  		}
  		goto return_base;
-@@ -645,7 +684,26 @@ return_reval:
+@@ -645,7 +684,28 @@
  		 * Check the cached dentry for staleness.
  		 */
  		dentry = nd->dentry;
@@ -473,12 +481,14 @@
 +				}
 +				nd->dentry = new;
 +			}
++			if (!nd->dentry->d_inode)
++				goto no_inode;
 +		}
 +		else if (dentry && dentry->d_op && dentry->d_op->d_revalidate){
  			err = -ESTALE;
  			if (!dentry->d_op->d_revalidate(dentry, 0)) {
  				d_invalidate(dentry);
-@@ -658,15 +716,28 @@ out_dput:
+@@ -658,15 +718,28 @@
  		dput(dentry);
  		break;
  	}
@@ -508,7 +518,7 @@
  }
  
  /* SMP-safe */
-@@ -751,6 +822,17 @@ walk_init_root(const char *name, struct 
+@@ -751,6 +824,17 @@
  }
  
  /* SMP-safe */
@@ -526,7 +536,7 @@
  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
  {
  	int error = 0;
-@@ -765,6 +847,7 @@ int path_init(const char *name, unsigned
+@@ -765,6 +849,7 @@
  {
  	nd->last_type = LAST_ROOT; /* if there are only slashes... */
  	nd->flags = flags;
@@ -534,7 +544,7 @@
  	if (*name=='/')
  		return walk_init_root(name,nd);
  	read_lock(&current->fs->lock);
-@@ -779,7 +862,8 @@ int path_init(const char *name, unsigned
+@@ -779,7 +864,8 @@
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -544,7 +554,7 @@
  {
  	struct dentry * dentry;
  	struct inode *inode;
-@@ -802,13 +886,16 @@ struct dentry * lookup_hash(struct qstr 
+@@ -802,13 +888,16 @@
  			goto out;
  	}
  
@@ -562,7 +572,7 @@
  		dentry = inode->i_op->lookup(inode, new);
  		unlock_kernel();
  		if (!dentry)
-@@ -820,6 +907,12 @@ out:
+@@ -820,6 +909,12 @@
  	return dentry;
  }
  
@@ -575,7 +585,7 @@
  /* SMP-safe */
  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
  {
-@@ -841,7 +934,7 @@ struct dentry * lookup_one_len(const cha
+@@ -841,7 +936,7 @@
  	}
  	this.hash = end_name_hash(hash);
  
@@ -584,7 +594,7 @@
  access:
  	return ERR_PTR(-EACCES);
  }
-@@ -872,6 +965,23 @@ int __user_walk(const char *name, unsign
+@@ -872,6 +967,23 @@
  	return err;
  }
  
@@ -608,7 +618,7 @@
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -969,6 +1079,37 @@ static inline int lookup_flags(unsigned 
+@@ -969,6 +1081,37 @@
  	return retval;
  }
  
@@ -646,7 +656,7 @@
  int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
  {
  	int error;
-@@ -1045,14 +1186,17 @@ int may_open(struct nameidata *nd, int a
+@@ -1045,14 +1188,17 @@
          return get_lease(inode, flag);
  }
  
@@ -665,7 +675,7 @@
  	int count = 0;
  	
  	if (!capable(CAP_SYS_ADMIN))
-@@ -1063,13 +1207,14 @@ struct file *filp_open(const char * path
+@@ -1063,13 +1209,14 @@
  	if (flag & O_TRUNC)
  		flag |= 2;
  
@@ -681,7 +691,7 @@
  		if (error)
  			return ERR_PTR(error);
  		dentry = nd.dentry;
-@@ -1079,6 +1224,8 @@ struct file *filp_open(const char * path
+@@ -1079,6 +1226,8 @@
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -690,7 +700,7 @@
  	error = path_lookup(pathname, LOOKUP_PARENT, &nd);
  	if (error)
  		return ERR_PTR(error);
-@@ -1094,7 +1241,7 @@ struct file *filp_open(const char * path
+@@ -1094,7 +1243,7 @@
  
  	dir = nd.dentry;
  	down(&dir->d_inode->i_sem);
@@ -699,7 +709,7 @@
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1103,10 +1250,11 @@ do_last:
+@@ -1103,10 +1252,11 @@
  		goto exit;
  	}
  
@@ -713,7 +723,7 @@
  		up(&dir->d_inode->i_sem);
  		dput(nd.dentry);
  		nd.dentry = dentry;
-@@ -1132,12 +1280,12 @@ do_last:
+@@ -1132,12 +1282,12 @@
  		error = -ELOOP;
  		if (flag & O_NOFOLLOW)
  			goto exit_dput;
@@ -728,7 +738,7 @@
  		goto do_link;
  
  	dput(nd.dentry);
-@@ -1152,11 +1300,13 @@ ok:
+@@ -1152,11 +1302,13 @@
  	if (!S_ISREG(nd.dentry->d_inode->i_mode))
  		open_flags &= ~O_TRUNC;
  
@@ -743,7 +753,7 @@
  	path_release(&nd);
  	return ERR_PTR(error);
  
-@@ -1175,10 +1325,14 @@ do_link:
+@@ -1175,10 +1327,14 @@
  	 * are done. Procfs-like symlinks just set LAST_BIND.
  	 */
  	UPDATE_ATIME(dentry->d_inode);
@@ -759,7 +769,7 @@
  	if (nd.last_type == LAST_BIND) {
  		dentry = nd.dentry;
  		goto ok;
-@@ -1197,13 +1351,15 @@ do_link:
+@@ -1197,13 +1353,15 @@
  	}
  	dir = nd.dentry;
  	down(&dir->d_inode->i_sem);
@@ -777,7 +787,7 @@
  {
  	struct dentry *dentry;
  
-@@ -1211,7 +1367,7 @@ static struct dentry *lookup_create(stru
+@@ -1211,7 +1369,7 @@
  	dentry = ERR_PTR(-EEXIST);
  	if (nd->last_type != LAST_NORM)
  		goto fail;
@@ -786,12 +796,16 @@
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1267,7 +1423,16 @@ asmlinkage long sys_mknod(const char * f
+@@ -1267,7 +1425,20 @@
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
 -	dentry = lookup_create(&nd, 0);
 +
++	if (nd.last_type != LAST_NORM) {
++		error = -EEXIST;
++		goto out2;
++	}
 +	if (nd.dentry->d_inode->i_op->mknod_raw) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
 +		error = op->mknod_raw(&nd, mode, dev);
@@ -804,7 +818,7 @@
  	error = PTR_ERR(dentry);
  
  	mode &= ~current->fs->umask;
-@@ -1288,6 +1453,7 @@ asmlinkage long sys_mknod(const char * f
+@@ -1288,6 +1459,7 @@
  		dput(dentry);
  	}
  	up(&nd.dentry->d_inode->i_sem);
@@ -812,11 +826,15 @@
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1335,7 +1501,14 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1335,7 +1507,18 @@
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 1);
++		if (nd.last_type != LAST_NORM) {
++			error = -EEXIST;
++			goto out2;
++		}
 +		if (nd.dentry->d_inode->i_op->mkdir_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->mkdir_raw(&nd, mode);
@@ -828,7 +846,7 @@
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
  			error = vfs_mkdir(nd.dentry->d_inode, dentry,
-@@ -1343,6 +1516,7 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1343,6 +1526,7 @@
  			dput(dentry);
  		}
  		up(&nd.dentry->d_inode->i_sem);
@@ -836,7 +854,7 @@
  		path_release(&nd);
  out:
  		putname(tmp);
-@@ -1443,8 +1617,16 @@ asmlinkage long sys_rmdir(const char * p
+@@ -1443,8 +1627,16 @@
  			error = -EBUSY;
  			goto exit1;
  	}
@@ -854,7 +872,7 @@
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1502,8 +1684,15 @@ asmlinkage long sys_unlink(const char * 
+@@ -1502,8 +1694,15 @@
  	error = -EISDIR;
  	if (nd.last_type != LAST_NORM)
  		goto exit1;
@@ -871,11 +889,15 @@
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1570,15 +1759,23 @@ asmlinkage long sys_symlink(const char *
+@@ -1570,15 +1769,27 @@
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 0);
++		if (nd.last_type != LAST_NORM) {
++			error = -EEXIST;
++			goto out2;
++		}
 +		if (nd.dentry->d_inode->i_op->symlink_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->symlink_raw(&nd, from);
@@ -897,11 +919,15 @@
  		putname(to);
  	}
  	putname(from);
-@@ -1654,7 +1851,14 @@ asmlinkage long sys_link(const char * ol
+@@ -1654,7 +1865,18 @@
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
 -		new_dentry = lookup_create(&nd, 0);
++		if (nd.last_type != LAST_NORM) {
++			error = -EEXIST;
++			goto out_release;
++		}
 +		if (nd.dentry->d_inode->i_op->link_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->link_raw(&old_nd, &nd);
@@ -913,7 +939,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 +1902,7 @@ exit:
+@@ -1698,7 +1920,7 @@
   *	   locking].
   */
  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
@@ -922,7 +948,7 @@
  {
  	int error;
  	struct inode *target;
-@@ -1777,7 +1981,7 @@ out_unlock:
+@@ -1777,7 +1999,7 @@
  }
  
  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
@@ -931,7 +957,7 @@
  {
  	int error;
  
-@@ -1865,9 +2069,18 @@ static inline int do_rename(const char *
+@@ -1865,9 +2087,18 @@
  	if (newnd.last_type != LAST_NORM)
  		goto exit2;
  
@@ -951,7 +977,7 @@
  	error = PTR_ERR(old_dentry);
  	if (IS_ERR(old_dentry))
  		goto exit3;
-@@ -1883,16 +2096,16 @@ static inline int do_rename(const char *
+@@ -1883,16 +2114,16 @@
  		if (newnd.last.name[newnd.last.len])
  			goto exit4;
  	}
@@ -970,7 +996,7 @@
  	dput(new_dentry);
  exit4:
  	dput(old_dentry);
-@@ -1943,12 +2156,17 @@ out:
+@@ -1943,12 +2174,17 @@
  }
  
  static inline int
@@ -989,7 +1015,7 @@
  
  	if (*link == '/') {
  		path_release(nd);
-@@ -1956,7 +2174,7 @@ __vfs_follow_link(struct nameidata *nd, 
+@@ -1956,7 +2192,7 @@
  			/* weird __emul_prefix() stuff did it */
  			goto out;
  	}
@@ -998,7 +1024,7 @@
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
  		return res;
-@@ -1978,7 +2196,13 @@ fail:
+@@ -1978,7 +2214,13 @@
  
  int vfs_follow_link(struct nameidata *nd, const char *link)
  {
@@ -1013,7 +1039,7 @@
  }
  
  /* get the link contents into pagecache */
-@@ -2020,7 +2244,7 @@ int page_follow_link(struct dentry *dent
+@@ -2020,7 +2262,7 @@
  {
  	struct page *page = NULL;
  	char *s = page_getlink(dentry, &page);
@@ -1022,8 +1048,10 @@
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
---- linux-2.4.18-chaos/fs/open.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:06.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/open.c	2003-09-14 17:25:41.000000000 +0400
+Index: linux-2.4.18-p4smp/fs/open.c
+===================================================================
+--- linux-2.4.18-p4smp.orig/fs/open.c	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/fs/open.c	2004-03-19 16:05:42.000000000 -0500
 @@ -19,6 +19,8 @@
  #include <asm/uaccess.h>
  
@@ -1033,7 +1061,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);
  }
  
@@ -1045,7 +1073,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;
@@ -1060,7 +1088,7 @@
  	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;
@@ -1075,7 +1103,7 @@
  	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);
@@ -1090,7 +1118,7 @@
  	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)
@@ -1099,7 +1127,7 @@
  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;
  
@@ -1114,7 +1142,7 @@
  	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;
@@ -1141,7 +1169,7 @@
  	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;
  
@@ -1157,7 +1185,7 @@
  	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;
@@ -1179,7 +1207,7 @@
  		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;
@@ -1187,7 +1215,7 @@
  
  	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;
  
@@ -1203,7 +1231,7 @@
  		path_release(&nd);
  	}
  
-@@ -385,8 +430,11 @@ asmlinkage long sys_chdir(const char * f
+@@ -385,8 +430,11 @@
  {
  	int error;
  	struct nameidata nd;
@@ -1216,7 +1244,7 @@
  	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:
@@ -1224,7 +1252,7 @@
  	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;
@@ -1237,7 +1265,7 @@
  	if (error)
  		goto out;
  
-@@ -454,39 +504,56 @@ asmlinkage long sys_chroot(const char * 
+@@ -454,39 +504,56 @@
  	set_fs_altroot();
  	error = 0;
  dput_and_out:
@@ -1308,7 +1336,7 @@
  	fput(file);
  out:
  	return err;
-@@ -495,30 +562,14 @@ out:
+@@ -495,30 +562,14 @@
  asmlinkage long sys_chmod(const char * filename, mode_t mode)
  {
  	struct nameidata nd;
@@ -1340,7 +1368,7 @@
  	path_release(&nd);
  out:
  	return error;
-@@ -538,6 +589,20 @@ static int chown_common(struct dentry * 
+@@ -538,6 +589,20 @@
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto out;
@@ -1361,7 +1389,7 @@
  	error = -EPERM;
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto out;
-@@ -628,7 +693,8 @@ extern ssize_t do_readahead(struct file 
+@@ -628,7 +693,8 @@
  /* for files over a certains size it doesn't pay to do readahead on open */
  #define READAHEAD_CUTOFF 48000
  
@@ -1371,7 +1399,7 @@
  {
  	struct file * f;
  	struct inode *inode;
-@@ -649,7 +715,7 @@ struct file *dentry_open(struct dentry *
+@@ -649,7 +715,7 @@
  		error = locks_verify_locked(inode);
  		if (!error) {
  			DQUOT_INIT(inode);
@@ -1380,7 +1408,7 @@
  		}
  		if (error || !(f->f_mode & FMODE_WRITE))
  			put_write_access(inode);
-@@ -679,7 +745,9 @@ struct file *dentry_open(struct dentry *
+@@ -679,7 +745,9 @@
  	}
  
  	if (f->f_op && f->f_op->open) {
@@ -1390,7 +1418,7 @@
  		if (error)
  			goto cleanup_all;
  	}
-@@ -693,6 +761,7 @@ struct file *dentry_open(struct dentry *
+@@ -693,6 +761,7 @@
  		do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT);
  	
  
@@ -1398,7 +1426,7 @@
  	return f;
  
  cleanup_all:
-@@ -707,11 +776,17 @@ cleanup_all:
+@@ -707,11 +776,17 @@
  cleanup_file:
  	put_filp(f);
  cleanup_dentry:
@@ -1416,9 +1444,11 @@
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
---- linux-2.4.18-chaos/fs/stat.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:06.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/fs/stat.c	2003-09-14 17:30:21.000000000 +0400
-@@ -17,21 +17,26 @@
+Index: linux-2.4.18-p4smp/fs/stat.c
+===================================================================
+--- linux-2.4.18-p4smp.orig/fs/stat.c	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/fs/stat.c	2004-03-19 16:06:19.000000000 -0500
+@@ -17,21 +17,24 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
  static __inline__ int
@@ -1427,8 +1457,6 @@
  {
  	struct inode * inode = dentry->d_inode;
 -	if (inode->i_op && inode->i_op->revalidate)
-+	if (!inode)
-+		return -ENOENT;
 +	if (inode->i_op && inode->i_op->revalidate_it)
 +		return inode->i_op->revalidate_it(dentry, it);
 +	else if (inode->i_op && inode->i_op->revalidate)
@@ -1449,7 +1477,7 @@
  	if (res)
  		return res;
  
-@@ -104,10 +109,12 @@ int vfs_stat(char *name, struct kstat *s
+@@ -104,10 +107,12 @@
  {
  	struct nameidata nd;
  	int error;
@@ -1464,7 +1492,7 @@
  		path_release(&nd);
  	}
  	return error;
-@@ -117,10 +124,12 @@ int vfs_lstat(char *name, struct kstat *
+@@ -117,10 +122,12 @@
  {
  	struct nameidata nd;
  	int error;
@@ -1479,7 +1507,7 @@
  		path_release(&nd);
  	}
  	return error;
-@@ -132,7 +141,7 @@ int vfs_fstat(unsigned int fd, struct ks
+@@ -132,7 +139,7 @@
  	int error = -EBADF;
  
  	if (f) {
@@ -1488,7 +1516,7 @@
  		fput(f);
  	}
  	return error;
-@@ -279,7 +288,7 @@ asmlinkage long sys_readlink(const char 
+@@ -279,7 +286,7 @@
  
  		error = -EINVAL;
  		if (inode->i_op && inode->i_op->readlink &&
@@ -1497,8 +1525,10 @@
  			UPDATE_ATIME(inode);
  			error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
  		}
---- linux-2.4.18-chaos/include/linux/dcache.h~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:16.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/include/linux/dcache.h	2003-09-14 17:25:41.000000000 +0400
+Index: linux-2.4.18-p4smp/include/linux/dcache.h
+===================================================================
+--- linux-2.4.18-p4smp.orig/include/linux/dcache.h	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/include/linux/dcache.h	2004-03-19 16:05:42.000000000 -0500
 @@ -5,6 +5,51 @@
  
  #include <asm/atomic.h>
@@ -1551,7 +1581,7 @@
  
  /*
   * 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 *);
@@ -1574,7 +1604,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
-@@ -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. */
@@ -1582,9 +1612,11 @@
  
  extern spinlock_t dcache_lock;
  
---- linux-2.4.18-chaos/include/linux/fs.h~vfs_intent-2.4.18-18-chaos65	2003-09-14 17:24:21.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/include/linux/fs.h	2003-09-14 17:25:41.000000000 +0400
-@@ -73,6 +73,7 @@ extern int leases_enable, dir_notify_ena
+Index: linux-2.4.18-p4smp/include/linux/fs.h
+===================================================================
+--- linux-2.4.18-p4smp.orig/include/linux/fs.h	2004-03-19 16:05:40.000000000 -0500
++++ linux-2.4.18-p4smp/include/linux/fs.h	2004-03-19 16:05:42.000000000 -0500
+@@ -73,6 +73,7 @@
  
  #define FMODE_READ 1
  #define FMODE_WRITE 2
@@ -1592,7 +1624,7 @@
  
  #define READ 0
  #define WRITE 1
-@@ -339,6 +340,9 @@ extern void set_bh_page(struct buffer_he
+@@ -339,6 +340,9 @@
  #define ATTR_MTIME_SET	256
  #define ATTR_FORCE	512	/* Not a change, but a change it */
  #define ATTR_ATTR_FLAG	1024
@@ -1602,7 +1634,7 @@
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -474,6 +478,7 @@ struct inode {
+@@ -474,6 +478,7 @@
  	struct pipe_inode_info	*i_pipe;
  	struct block_device	*i_bdev;
  	struct char_device	*i_cdev;
@@ -1610,7 +1642,7 @@
  
  	unsigned long		i_dnotify_mask; /* Directory notify events */
  	struct dnotify_struct	*i_dnotify; /* for directory notifications */
-@@ -578,6 +583,7 @@ struct file {
+@@ -578,6 +583,7 @@
  
  	/* needed for tty driver, and maybe others */
  	void			*private_data;
@@ -1618,7 +1650,7 @@
  
  	/* preallocated helper kiobuf to speedup O_DIRECT */
  	struct kiobuf		*f_iobuf;
-@@ -707,6 +713,7 @@ struct nameidata {
+@@ -707,6 +713,7 @@
  	struct qstr last;
  	unsigned int flags;
  	int last_type;
@@ -1626,7 +1658,7 @@
  };
  
  #define DQUOT_USR_ENABLED	0x01		/* User diskquotas enabled */
-@@ -840,7 +847,8 @@ extern int vfs_symlink(struct inode *, s
+@@ -840,7 +847,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 *);
@@ -1636,7 +1668,7 @@
  
  /*
   * File types
-@@ -900,21 +908,34 @@ struct file_operations {
+@@ -900,21 +908,34 @@
  
  struct inode_operations {
  	int (*create) (struct inode *,struct dentry *,int);
@@ -1671,7 +1703,7 @@
  	int (*getattr) (struct dentry *, struct iattr *);
  };
  
-@@ -1119,10 +1140,12 @@ static inline int get_lease(struct inode
+@@ -1119,10 +1140,12 @@
  
  asmlinkage long sys_open(const char *, int, int);
  asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
@@ -1685,7 +1717,7 @@
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char *);
  
-@@ -1388,9 +1411,12 @@ typedef int (*read_actor_t)(read_descrip
+@@ -1388,9 +1411,12 @@
  extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
  
  extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
@@ -1698,7 +1730,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 +1425,8 @@ extern struct dentry * lookup_one_len(co
+@@ -1399,6 +1425,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)
@@ -1707,7 +1739,7 @@
  
  extern void inode_init_once(struct inode *);
  extern void iput(struct inode *);
-@@ -1499,6 +1527,8 @@ extern struct file_operations generic_ro
+@@ -1499,6 +1527,8 @@
  
  extern int vfs_readlink(struct dentry *, char *, int, const char *);
  extern int vfs_follow_link(struct nameidata *, const char *);
@@ -1716,9 +1748,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-chaos/kernel/fork.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:20.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/kernel/fork.c	2003-09-14 17:25:41.000000000 +0400
-@@ -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	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/kernel/fork.c	2004-03-19 16:05:42.000000000 -0500
+@@ -399,10 +399,13 @@
  		fs->umask = old->umask;
  		read_lock(&old->lock);
  		fs->rootmnt = mntget(old->rootmnt);
@@ -1732,9 +1766,11 @@
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
---- linux-2.4.18-chaos/kernel/exit.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:20.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/kernel/exit.c	2003-09-14 17:25:41.000000000 +0400
-@@ -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	2004-02-03 01:00:10.000000000 -0500
++++ linux-2.4.18-p4smp/kernel/exit.c	2004-03-19 16:05:42.000000000 -0500
+@@ -303,11 +303,14 @@
  {
  	/* No need to hold fs->lock if we are killing it */
  	if (atomic_dec_and_test(&fs->count)) {
@@ -1749,9 +1785,11 @@
  			dput(fs->altroot);
  			mntput(fs->altrootmnt);
  		}
---- linux-2.4.18-chaos/kernel/ksyms.c~vfs_intent-2.4.18-18-chaos65	2003-09-14 17:24:22.000000000 +0400
-+++ linux-2.4.18-chaos-alexey/kernel/ksyms.c	2003-09-14 17:25:41.000000000 +0400
-@@ -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	2004-03-19 16:05:40.000000000 -0500
++++ linux-2.4.18-p4smp/kernel/ksyms.c	2004-03-19 16:05:42.000000000 -0500
+@@ -293,6 +293,7 @@
  EXPORT_SYMBOL(set_page_dirty);
  EXPORT_SYMBOL(vfs_readlink);
  EXPORT_SYMBOL(vfs_follow_link);
@@ -1759,5 +1797,3 @@
  EXPORT_SYMBOL(page_readlink);
  EXPORT_SYMBOL(page_follow_link);
  EXPORT_SYMBOL(page_symlink_inode_operations);
-
-_
diff --git a/lustre/kernel_patches/series/chaos-2.4.18 b/lustre/kernel_patches/series/chaos-2.4.18
index 9bd5681..c69f42f 100644
--- a/lustre/kernel_patches/series/chaos-2.4.18
+++ b/lustre/kernel_patches/series/chaos-2.4.18
@@ -36,3 +36,5 @@ ext3-xattr-ptr-arith-fix.patch
 kernel_text_address-2.4.18-chaos.patch
 procfs-ndynamic-2.4.patch 
 ext3-truncate-buffer-head.patch
+inode-max-readahead-2.4.24.patch
+dcache_refcount_debug.patch
-- 
1.8.3.1