From 2744e4e5171f649b3782909857438a8e2e40db4b Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Mon, 27 Sep 2004 15:36:31 +0000
Subject: [PATCH] Commit changes from b_release_1_3_2  - update rhel kernel to
 2.4.21-20.EL  - small lbuild fixes

---
 .../patches/vfs_intent-2.4.21-rhel.patch           | 352 +++++++++++----------
 lustre/kernel_patches/series/rhel-2.4.21           |   5 +-
 2 files changed, 183 insertions(+), 174 deletions(-)

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch
index 85a8942..119d0f1 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.21-rhel.patch
@@ -12,11 +12,11 @@
  kernel/ksyms.c            |    1 
  12 files changed, 558 insertions(+), 128 deletions(-)
 
-Index: linux-ia64/fs/dcache.c
+Index: linux-2.4.21/fs/dcache.c
 ===================================================================
---- linux-ia64.orig/fs/dcache.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/fs/dcache.c	2004-03-17 16:05:28.000000000 -0800
-@@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry)
+--- linux-2.4.21.orig/fs/dcache.c	2004-09-11 10:16:31.000000000 -0400
++++ linux-2.4.21/fs/dcache.c	2004-09-16 19:32:11.000000000 -0400
+@@ -187,6 +187,13 @@
  		spin_unlock(&dcache_lock);
  		return 0;
  	}
@@ -30,7 +30,7 @@ Index: linux-ia64/fs/dcache.c
  	/*
  	 * Check whether to do a partial shrink_dcache
  	 * to get rid of unused child entries.
-@@ -850,13 +857,19 @@ void d_delete(struct dentry * dentry)
+@@ -848,13 +855,19 @@
   * Adds a dentry to the hash according to its name.
   */
   
@@ -53,11 +53,11 @@ Index: linux-ia64/fs/dcache.c
  }
  
  #define do_switch(x,y) do { \
-Index: linux-ia64/fs/exec.c
+Index: linux-2.4.21/fs/exec.c
 ===================================================================
---- linux-ia64.orig/fs/exec.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/fs/exec.c	2004-03-17 16:05:28.000000000 -0800
-@@ -119,8 +119,10 @@ asmlinkage long sys_uselib(const char * 
+--- linux-2.4.21.orig/fs/exec.c	2004-09-11 10:16:39.000000000 -0400
++++ linux-2.4.21/fs/exec.c	2004-09-16 19:32:11.000000000 -0400
+@@ -116,8 +116,10 @@
  	struct file * file;
  	struct nameidata nd;
  	int error;
@@ -69,7 +69,7 @@ Index: linux-ia64/fs/exec.c
  	if (error)
  		goto out;
  
-@@ -132,7 +134,8 @@ asmlinkage long sys_uselib(const char * 
+@@ -129,7 +131,8 @@
  	if (error)
  		goto exit;
  
@@ -79,7 +79,7 @@ Index: linux-ia64/fs/exec.c
  	error = PTR_ERR(file);
  	if (IS_ERR(file))
  		goto out;
-@@ -400,8 +403,10 @@ struct file *open_exec(const char *name)
+@@ -401,8 +404,10 @@
  	struct inode *inode;
  	struct file *file;
  	int err = 0;
@@ -91,7 +91,7 @@ Index: linux-ia64/fs/exec.c
  	file = ERR_PTR(err);
  	if (!err) {
  		inode = nd.dentry->d_inode;
-@@ -413,7 +418,8 @@ struct file *open_exec(const char *name)
+@@ -414,7 +419,8 @@
  				err = -EACCES;
  			file = ERR_PTR(err);
  			if (!err) {
@@ -101,7 +101,7 @@ Index: linux-ia64/fs/exec.c
  				if (!IS_ERR(file)) {
  					err = deny_write_access(file);
  					if (err) {
-@@ -425,6 +431,7 @@ out:
+@@ -426,6 +432,7 @@
  				return file;
  			}
  		}
@@ -109,7 +109,7 @@ Index: linux-ia64/fs/exec.c
  		path_release(&nd);
  	}
  	goto out;
-@@ -1348,7 +1355,7 @@ int do_coredump(long signr, int exit_cod
+@@ -1355,7 +1362,7 @@
  		goto close_fail;
  	if (!file->f_op->write)
  		goto close_fail;
@@ -118,10 +118,10 @@ Index: linux-ia64/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-Index: linux-ia64/fs/namei.c
+Index: linux-2.4.21/fs/namei.c
 ===================================================================
---- linux-ia64.orig/fs/namei.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/fs/namei.c	2004-03-17 16:06:13.000000000 -0800
+--- linux-2.4.21.orig/fs/namei.c	2004-09-11 10:16:29.000000000 -0400
++++ linux-2.4.21/fs/namei.c	2004-09-16 19:34:57.000000000 -0400
 @@ -94,6 +94,13 @@
   * XEmacs seems to be relying on it...
   */
@@ -136,7 +136,7 @@ Index: linux-ia64/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
   */
@@ -157,7 +157,7 @@ Index: linux-ia64/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,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
   */
@@ -174,7 +174,7 @@ Index: linux-ia64/fs/namei.c
  	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();
@@ -184,7 +184,7 @@ Index: linux-ia64/fs/namei.c
  			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);
  		}
@@ -200,7 +200,7 @@ Index: linux-ia64/fs/namei.c
  	}
  	return result;
  }
-@@ -332,7 +364,8 @@ static struct dentry * real_lookup(struc
+@@ -332,7 +364,8 @@
   * Without that kind of total limit, nasty chains of consecutive
   * symlinks can cause almost arbitrarily long lookups. 
   */
@@ -210,7 +210,7 @@ Index: linux-ia64/fs/namei.c
  {
  	int err;
  	if (current->link_count >= 8)
-@@ -346,10 +379,12 @@ static inline int do_follow_link(struct 
+@@ -346,10 +379,12 @@
  	current->link_count++;
  	current->total_link_count++;
  	UPDATE_ATIME(dentry->d_inode);
@@ -223,7 +223,7 @@ Index: linux-ia64/fs/namei.c
  	path_release(nd);
  	return -ELOOP;
  }
-@@ -447,7 +482,8 @@ static inline void follow_dotdot(struct 
+@@ -447,7 +482,8 @@
   *
   * We expect 'base' to be positive and a directory.
   */
@@ -233,7 +233,7 @@ Index: linux-ia64/fs/namei.c
  {
  	struct dentry *dentry;
  	struct inode *inode;
-@@ -524,12 +560,12 @@ int link_path_walk(const char * name, st
+@@ -524,12 +560,12 @@
  				break;
  		}
  		/* This does the actual lookups.. */
@@ -248,7 +248,7 @@ Index: linux-ia64/fs/namei.c
  			err = PTR_ERR(dentry);
  			if (IS_ERR(dentry))
  				break;
-@@ -547,7 +583,7 @@ int link_path_walk(const char * name, st
+@@ -547,7 +583,7 @@
  			goto out_dput;
  
  		if (inode->i_op->follow_link) {
@@ -257,7 +257,7 @@ Index: linux-ia64/fs/namei.c
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -563,7 +599,7 @@ int link_path_walk(const char * name, st
+@@ -563,7 +599,7 @@
  			nd->dentry = dentry;
  		}
  		err = -ENOTDIR; 
@@ -266,22 +266,22 @@ Index: linux-ia64/fs/namei.c
  			break;
  		continue;
  		/* here ends the main loop */
-@@ -590,12 +626,12 @@ last_component:
+@@ -590,12 +626,12 @@
  			if (err < 0)
  				break;
  		}
--		dentry = cached_lookup(nd->dentry, &this, 0);
-+		dentry = cached_lookup(nd->dentry, &this, 0, it);
+-		dentry = cached_lookup(nd->dentry, &this, nd->flags);
++		dentry = cached_lookup(nd->dentry, &this, nd->flags, it);
  		if (!dentry) {
  			err = -EWOULDBLOCKIO;
  			if (atomic)
  				break;
--			dentry = real_lookup(nd->dentry, &this, 0);
-+			dentry = real_lookup(nd->dentry, &this, 0, it);
+-			dentry = real_lookup(nd->dentry, &this, nd->flags);
++			dentry = real_lookup(nd->dentry, &this, nd->flags, it);
  			err = PTR_ERR(dentry);
  			if (IS_ERR(dentry))
  				break;
-@@ -605,7 +641,7 @@ last_component:
+@@ -605,7 +641,7 @@
  		inode = dentry->d_inode;
  		if ((lookup_flags & LOOKUP_FOLLOW)
  		    && inode && inode->i_op && inode->i_op->follow_link) {
@@ -290,7 +290,7 @@ Index: linux-ia64/fs/namei.c
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -619,7 +655,8 @@ last_component:
+@@ -619,7 +655,8 @@
  			goto no_inode;
  		if (lookup_flags & LOOKUP_DIRECTORY) {
  			err = -ENOTDIR; 
@@ -300,7 +300,7 @@ Index: linux-ia64/fs/namei.c
  				break;
  		}
  		goto return_base;
-@@ -643,6 +680,34 @@ return_reval:
+@@ -643,6 +680,34 @@
  		 * Check the cached dentry for staleness.
  		 */
  		dentry = nd->dentry;
@@ -335,7 +335,7 @@ Index: linux-ia64/fs/namei.c
  		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
  			err = -ESTALE;
  			if (!dentry->d_op->d_revalidate(dentry, 0)) {
-@@ -656,15 +714,28 @@ out_dput:
+@@ -656,15 +721,28 @@
  		dput(dentry);
  		break;
  	}
@@ -365,7 +365,7 @@ Index: linux-ia64/fs/namei.c
  }
  
  /* SMP-safe */
-@@ -749,6 +820,17 @@ walk_init_root(const char *name, struct 
+@@ -749,6 +827,17 @@
  }
  
  /* SMP-safe */
@@ -383,7 +383,7 @@ Index: linux-ia64/fs/namei.c
  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
  {
  	int error = 0;
-@@ -763,6 +845,7 @@ int path_init(const char *name, unsigned
+@@ -763,6 +852,7 @@
  {
  	nd->last_type = LAST_ROOT; /* if there are only slashes... */
  	nd->flags = flags;
@@ -391,7 +391,7 @@ Index: linux-ia64/fs/namei.c
  	if (*name=='/')
  		return walk_init_root(name,nd);
  	read_lock(&current->fs->lock);
-@@ -777,7 +860,8 @@ int path_init(const char *name, unsigned
+@@ -777,7 +867,8 @@
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -401,7 +401,7 @@ Index: linux-ia64/fs/namei.c
  {
  	struct dentry * dentry;
  	struct inode *inode;
-@@ -800,13 +884,16 @@ struct dentry * lookup_hash(struct qstr 
+@@ -800,13 +891,16 @@
  			goto out;
  	}
  
@@ -419,7 +419,7 @@ Index: linux-ia64/fs/namei.c
  		dentry = inode->i_op->lookup(inode, new);
  		unlock_kernel();
  		if (!dentry)
-@@ -818,6 +905,12 @@ out:
+@@ -818,6 +912,12 @@
  	return dentry;
  }
  
@@ -432,7 +432,7 @@ Index: linux-ia64/fs/namei.c
  /* SMP-safe */
  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
  {
-@@ -839,7 +932,7 @@ struct dentry * lookup_one_len(const cha
+@@ -839,7 +939,7 @@
  	}
  	this.hash = end_name_hash(hash);
  
@@ -441,7 +441,7 @@ Index: linux-ia64/fs/namei.c
  access:
  	return ERR_PTR(-EACCES);
  }
-@@ -870,6 +963,23 @@ int __user_walk(const char *name, unsign
+@@ -870,6 +970,23 @@
  	return err;
  }
  
@@ -465,7 +465,7 @@ Index: linux-ia64/fs/namei.c
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -967,7 +1077,8 @@ static inline int lookup_flags(unsigned 
+@@ -967,7 +1084,8 @@
  	return retval;
  }
  
@@ -475,7 +475,7 @@ Index: linux-ia64/fs/namei.c
  {
  	int error;
  
-@@ -980,12 +1091,15 @@ int vfs_create(struct inode *dir, struct
+@@ -980,12 +1098,15 @@
  		goto exit_lock;
  
  	error = -EACCES;	/* shouldn't it be ENOSYS? */
@@ -493,7 +493,7 @@ Index: linux-ia64/fs/namei.c
  	unlock_kernel();
  exit_lock:
  	up(&dir->i_zombie);
-@@ -994,6 +1108,11 @@ exit_lock:
+@@ -994,6 +1115,11 @@
  	return error;
  }
  
@@ -505,7 +505,7 @@ Index: linux-ia64/fs/namei.c
  /*
   *	open_namei()
   *
-@@ -1008,7 +1127,8 @@ exit_lock:
+@@ -1008,7 +1134,8 @@
   * for symlinks (where the permissions are checked later).
   * SMP-safe
   */
@@ -515,7 +515,7 @@ Index: linux-ia64/fs/namei.c
  {
  	int acc_mode, error = 0;
  	struct inode *inode;
-@@ -1018,11 +1138,14 @@ int open_namei(const char * pathname, in
+@@ -1018,11 +1145,14 @@
  
  	acc_mode = ACC_MODE(flag);
  
@@ -531,7 +531,7 @@ Index: linux-ia64/fs/namei.c
  		if (error)
  			return error;
  		dentry = nd->dentry;
-@@ -1032,6 +1155,10 @@ int open_namei(const char * pathname, in
+@@ -1032,6 +1162,10 @@
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -542,7 +542,7 @@ Index: linux-ia64/fs/namei.c
  	error = path_lookup(pathname, LOOKUP_PARENT, nd);
  	if (error)
  		return error;
-@@ -1047,7 +1174,7 @@ int open_namei(const char * pathname, in
+@@ -1047,7 +1181,7 @@
  
  	dir = nd->dentry;
  	down(&dir->d_inode->i_sem);
@@ -551,7 +551,7 @@ Index: linux-ia64/fs/namei.c
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1056,11 +1183,12 @@ do_last:
+@@ -1056,11 +1190,12 @@
  		goto exit;
  	}
  
@@ -565,7 +565,7 @@ Index: linux-ia64/fs/namei.c
  		up(&dir->d_inode->i_sem);
  		dput(nd->dentry);
  		nd->dentry = dentry;
-@@ -1164,7 +1292,7 @@ ok:
+@@ -1164,7 +1299,7 @@
  		if (!error) {
  			DQUOT_INIT(inode);
  			
@@ -574,7 +574,7 @@ Index: linux-ia64/fs/namei.c
  		}
  		put_write_access(inode);
  		if (error)
-@@ -1176,8 +1304,10 @@ ok:
+@@ -1176,8 +1311,10 @@
  	return 0;
  
  exit_dput:
@@ -585,7 +585,7 @@ Index: linux-ia64/fs/namei.c
  	path_release(nd);
  	return error;
  
-@@ -1196,7 +1326,10 @@ do_link:
+@@ -1196,7 +1333,10 @@
  	 * are done. Procfs-like symlinks just set LAST_BIND.
  	 */
  	UPDATE_ATIME(dentry->d_inode);
@@ -596,7 +596,7 @@ Index: linux-ia64/fs/namei.c
  	dput(dentry);
  	if (error)
  		return error;
-@@ -1218,13 +1351,20 @@ do_link:
+@@ -1218,13 +1358,20 @@
  	}
  	dir = nd->dentry;
  	down(&dir->d_inode->i_sem);
@@ -619,7 +619,7 @@ Index: linux-ia64/fs/namei.c
  {
  	struct dentry *dentry;
  
-@@ -1232,7 +1372,7 @@ static struct dentry *lookup_create(stru
+@@ -1232,7 +1379,7 @@
  	dentry = ERR_PTR(-EEXIST);
  	if (nd->last_type != LAST_NORM)
  		goto fail;
@@ -628,7 +628,7 @@ Index: linux-ia64/fs/namei.c
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1288,7 +1428,20 @@ asmlinkage long sys_mknod(const char * f
+@@ -1288,7 +1435,20 @@
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
@@ -650,7 +650,7 @@ Index: linux-ia64/fs/namei.c
  	error = PTR_ERR(dentry);
  
  	if (!IS_POSIXACL(nd.dentry->d_inode))
-@@ -1310,6 +1463,7 @@ asmlinkage long sys_mknod(const char * f
+@@ -1310,6 +1470,7 @@
  		dput(dentry);
  	}
  	up(&nd.dentry->d_inode->i_sem);
@@ -658,7 +658,7 @@ Index: linux-ia64/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1357,7 +1511,18 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1357,7 +1518,18 @@
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
@@ -678,7 +678,7 @@ Index: linux-ia64/fs/namei.c
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
  			if (!IS_POSIXACL(nd.dentry->d_inode))
-@@ -1366,6 +1531,7 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1366,6 +1538,7 @@
  			dput(dentry);
  		}
  		up(&nd.dentry->d_inode->i_sem);
@@ -686,7 +686,7 @@ Index: linux-ia64/fs/namei.c
  		path_release(&nd);
  out:
  		putname(tmp);
-@@ -1466,8 +1632,16 @@ asmlinkage long sys_rmdir(const char * p
+@@ -1466,8 +1639,16 @@
  			error = -EBUSY;
  			goto exit1;
  	}
@@ -704,7 +704,7 @@ Index: linux-ia64/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1525,8 +1699,15 @@ asmlinkage long sys_unlink(const char * 
+@@ -1525,8 +1706,15 @@
  	error = -EISDIR;
  	if (nd.last_type != LAST_NORM)
  		goto exit1;
@@ -721,7 +721,7 @@ Index: linux-ia64/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1593,15 +1774,27 @@ asmlinkage long sys_symlink(const char *
+@@ -1593,15 +1781,27 @@
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
@@ -751,7 +751,7 @@ Index: linux-ia64/fs/namei.c
  		putname(to);
  	}
  	putname(from);
-@@ -1677,7 +1870,18 @@ asmlinkage long sys_link(const char * ol
+@@ -1677,7 +1877,18 @@
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
@@ -771,7 +771,7 @@ Index: linux-ia64/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);
-@@ -1721,7 +1925,7 @@ exit:
+@@ -1721,7 +1932,7 @@
   *	   locking].
   */
  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
@@ -780,7 +780,7 @@ Index: linux-ia64/fs/namei.c
  {
  	int error;
  	struct inode *target;
-@@ -1800,7 +2004,7 @@ out_unlock:
+@@ -1800,7 +2011,7 @@
  }
  
  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
@@ -789,7 +789,7 @@ Index: linux-ia64/fs/namei.c
  {
  	int error;
  
-@@ -1888,9 +2092,18 @@ static inline int do_rename(const char *
+@@ -1888,9 +2099,18 @@
  	if (newnd.last_type != LAST_NORM)
  		goto exit2;
  
@@ -809,7 +809,7 @@ Index: linux-ia64/fs/namei.c
  	error = PTR_ERR(old_dentry);
  	if (IS_ERR(old_dentry))
  		goto exit3;
-@@ -1906,16 +2119,16 @@ static inline int do_rename(const char *
+@@ -1906,16 +2126,16 @@
  		if (newnd.last.name[newnd.last.len])
  			goto exit4;
  	}
@@ -828,7 +828,7 @@ Index: linux-ia64/fs/namei.c
  	dput(new_dentry);
  exit4:
  	dput(old_dentry);
-@@ -1966,20 +2179,26 @@ out:
+@@ -1966,20 +2186,26 @@
  }
  
  static inline int
@@ -857,7 +857,7 @@ Index: linux-ia64/fs/namei.c
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
  		return res;
-@@ -2003,7 +2222,13 @@ fail:
+@@ -2003,7 +2229,13 @@
  
  int vfs_follow_link(struct nameidata *nd, const char *link)
  {
@@ -872,7 +872,7 @@ Index: linux-ia64/fs/namei.c
  }
  
  /* get the link contents into pagecache */
-@@ -2045,7 +2270,7 @@ int page_follow_link(struct dentry *dent
+@@ -2045,7 +2277,7 @@
  {
  	struct page *page = NULL;
  	char *s = page_getlink(dentry, &page);
@@ -881,11 +881,11 @@ Index: linux-ia64/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux-ia64/fs/namespace.c
+Index: linux-2.4.21/fs/namespace.c
 ===================================================================
---- linux-ia64.orig/fs/namespace.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/fs/namespace.c	2004-03-17 16:05:28.000000000 -0800
-@@ -98,6 +98,7 @@ static void detach_mnt(struct vfsmount *
+--- linux-2.4.21.orig/fs/namespace.c	2004-09-11 10:16:15.000000000 -0400
++++ linux-2.4.21/fs/namespace.c	2004-09-16 19:32:11.000000000 -0400
+@@ -98,6 +98,7 @@
  {
  	old_nd->dentry = mnt->mnt_mountpoint;
  	old_nd->mnt = mnt->mnt_parent;
@@ -893,7 +893,7 @@ Index: linux-ia64/fs/namespace.c
  	mnt->mnt_parent = mnt;
  	mnt->mnt_mountpoint = mnt->mnt_root;
  	list_del_init(&mnt->mnt_child);
-@@ -109,6 +110,7 @@ static void attach_mnt(struct vfsmount *
+@@ -109,6 +110,7 @@
  {
  	mnt->mnt_parent = mntget(nd->mnt);
  	mnt->mnt_mountpoint = dget(nd->dentry);
@@ -901,7 +901,7 @@ Index: linux-ia64/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++;
-@@ -488,14 +490,17 @@ static int do_loopback(struct nameidata 
+@@ -488,14 +490,17 @@
  {
  	struct nameidata old_nd;
  	struct vfsmount *mnt = NULL;
@@ -921,7 +921,7 @@ Index: linux-ia64/fs/namespace.c
  
  	down_write(&current->namespace->sem);
  	err = -EINVAL;
-@@ -518,6 +523,7 @@ static int do_loopback(struct nameidata 
+@@ -518,6 +523,7 @@
  	}
  
  	up_write(&current->namespace->sem);
@@ -929,7 +929,7 @@ Index: linux-ia64/fs/namespace.c
  	path_release(&old_nd);
  	return err;
  }
-@@ -701,6 +707,7 @@ long do_mount(char * dev_name, char * di
+@@ -701,6 +707,7 @@
  		  unsigned long flags, void *data_page)
  {
  	struct nameidata nd;
@@ -937,7 +937,7 @@ Index: linux-ia64/fs/namespace.c
  	int retval = 0;
  	int mnt_flags = 0;
  
-@@ -725,9 +732,11 @@ long do_mount(char * dev_name, char * di
+@@ -725,9 +732,11 @@
  	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
  
  	/* ... and get the mountpoint */
@@ -951,7 +951,7 @@ Index: linux-ia64/fs/namespace.c
  
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-@@ -739,6 +747,8 @@ long do_mount(char * dev_name, char * di
+@@ -739,6 +748,8 @@
  	else
  		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
  				      dev_name, data_page);
@@ -960,7 +960,7 @@ Index: linux-ia64/fs/namespace.c
  	path_release(&nd);
  	return retval;
  }
-@@ -904,6 +914,8 @@ asmlinkage long sys_pivot_root(const cha
+@@ -904,6 +915,8 @@
  {
  	struct vfsmount *tmp;
  	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
@@ -969,7 +969,7 @@ Index: linux-ia64/fs/namespace.c
  	int error;
  
  	if (!capable(CAP_SYS_ADMIN))
-@@ -911,14 +923,14 @@ asmlinkage long sys_pivot_root(const cha
+@@ -911,14 +924,14 @@
  
  	lock_kernel();
  
@@ -986,7 +986,7 @@ Index: linux-ia64/fs/namespace.c
  	if (error)
  		goto out1;
  
-@@ -973,8 +985,10 @@ out2:
+@@ -973,8 +986,10 @@
  	up(&old_nd.dentry->d_inode->i_zombie);
  	up_write(&current->namespace->sem);
  	path_release(&user_nd);
@@ -997,10 +997,10 @@ Index: linux-ia64/fs/namespace.c
  	path_release(&new_nd);
  out0:
  	unlock_kernel();
-Index: linux-ia64/fs/open.c
+Index: linux-2.4.21/fs/open.c
 ===================================================================
---- linux-ia64.orig/fs/open.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/fs/open.c	2004-03-17 16:05:28.000000000 -0800
+--- linux-2.4.21.orig/fs/open.c	2004-09-11 10:16:19.000000000 -0400
++++ linux-2.4.21/fs/open.c	2004-09-16 19:32:11.000000000 -0400
 @@ -19,6 +19,8 @@
  #include <asm/uaccess.h>
  
@@ -1010,7 +1010,7 @@ Index: linux-ia64/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);
  }
  
@@ -1022,7 +1022,7 @@ Index: linux-ia64/fs/open.c
  	int error;
  	struct iattr newattrs;
  
-@@ -109,7 +112,13 @@ int do_truncate(struct dentry *dentry, l
+@@ -109,7 +112,13 @@
  	down(&inode->i_sem);
  	newattrs.ia_size = length;
  	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
@@ -1037,7 +1037,7 @@ Index: linux-ia64/fs/open.c
  	up(&inode->i_sem);
  	up_write(&inode->i_alloc_sem);
  	return error;
-@@ -120,12 +129,13 @@ static inline long do_sys_truncate(const
+@@ -120,12 +129,13 @@
  	struct nameidata nd;
  	struct inode * inode;
  	int error;
@@ -1052,7 +1052,7 @@ Index: linux-ia64/fs/open.c
  	if (error)
  		goto out;
  	inode = nd.dentry->d_inode;
-@@ -165,11 +175,13 @@ static inline long do_sys_truncate(const
+@@ -165,11 +175,13 @@
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error) {
  		DQUOT_INIT(inode);
@@ -1067,7 +1067,7 @@ Index: linux-ia64/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -217,7 +229,7 @@ static inline long do_sys_ftruncate(unsi
+@@ -217,7 +229,7 @@
  
  	error = locks_verify_truncate(inode, file, length);
  	if (!error)
@@ -1076,7 +1076,7 @@ Index: linux-ia64/fs/open.c
  out_putf:
  	fput(file);
  out:
-@@ -262,11 +274,13 @@ asmlinkage long sys_utime(char * filenam
+@@ -262,11 +274,13 @@
  	struct inode * inode;
  	struct iattr newattrs;
  
@@ -1091,7 +1091,7 @@ Index: linux-ia64/fs/open.c
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
-@@ -281,11 +295,25 @@ asmlinkage long sys_utime(char * filenam
+@@ -281,11 +295,25 @@
  			goto dput_and_out;
  
  		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
@@ -1118,7 +1118,7 @@ Index: linux-ia64/fs/open.c
  	error = notify_change(nd.dentry, &newattrs);
  dput_and_out:
  	path_release(&nd);
-@@ -306,12 +334,14 @@ asmlinkage long sys_utimes(char * filena
+@@ -306,12 +334,14 @@
  	struct inode * inode;
  	struct iattr newattrs;
  
@@ -1134,7 +1134,7 @@ Index: linux-ia64/fs/open.c
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
-@@ -326,7 +356,20 @@ asmlinkage long sys_utimes(char * filena
+@@ -326,7 +356,20 @@
  		newattrs.ia_atime = times[0].tv_sec;
  		newattrs.ia_mtime = times[1].tv_sec;
  		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
@@ -1156,7 +1156,7 @@ Index: linux-ia64/fs/open.c
  		if (current->fsuid != inode->i_uid &&
  		    (error = permission(inode,MAY_WRITE)) != 0)
  			goto dput_and_out;
-@@ -349,6 +392,7 @@ asmlinkage long sys_access(const char * 
+@@ -349,6 +392,7 @@
  	int old_fsuid, old_fsgid;
  	kernel_cap_t old_cap;
  	int res;
@@ -1164,7 +1164,7 @@ Index: linux-ia64/fs/open.c
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
-@@ -366,13 +410,14 @@ asmlinkage long sys_access(const char * 
+@@ -366,13 +410,14 @@
  	else
  		current->cap_effective = current->cap_permitted;
  
@@ -1180,7 +1180,7 @@ Index: linux-ia64/fs/open.c
  		path_release(&nd);
  	}
  
-@@ -387,8 +432,9 @@ asmlinkage long sys_chdir(const char * f
+@@ -387,8 +432,9 @@
  {
  	int error;
  	struct nameidata nd;
@@ -1191,7 +1191,7 @@ Index: linux-ia64/fs/open.c
  	if (error)
  		goto out;
  
-@@ -399,6 +445,7 @@ asmlinkage long sys_chdir(const char * f
+@@ -399,6 +445,7 @@
  	set_fs_pwd(current->fs, nd.mnt, nd.dentry);
  
  dput_and_out:
@@ -1199,7 +1199,7 @@ Index: linux-ia64/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -438,9 +485,10 @@ asmlinkage long sys_chroot(const char * 
+@@ -438,9 +485,10 @@
  {
  	int error;
  	struct nameidata nd;
@@ -1212,7 +1212,7 @@ Index: linux-ia64/fs/open.c
  	if (error)
  		goto out;
  
-@@ -456,39 +504,56 @@ asmlinkage long sys_chroot(const char * 
+@@ -456,39 +504,56 @@
  	set_fs_altroot();
  	error = 0;
  dput_and_out:
@@ -1283,7 +1283,7 @@ Index: linux-ia64/fs/open.c
  	fput(file);
  out:
  	return err;
-@@ -497,30 +562,14 @@ out:
+@@ -497,30 +562,14 @@
  asmlinkage long sys_chmod(const char * filename, mode_t mode)
  {
  	struct nameidata nd;
@@ -1315,7 +1315,7 @@ Index: linux-ia64/fs/open.c
  	path_release(&nd);
  out:
  	return error;
-@@ -540,6 +589,20 @@ static int chown_common(struct dentry * 
+@@ -540,6 +589,20 @@
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto out;
@@ -1336,7 +1336,7 @@ Index: linux-ia64/fs/open.c
  	error = -EPERM;
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto out;
-@@ -644,6 +707,7 @@ struct file *filp_open(const char * file
+@@ -644,6 +707,7 @@
  {
  	int namei_flags, error;
  	struct nameidata nd;
@@ -1344,7 +1344,7 @@ Index: linux-ia64/fs/open.c
  
  	namei_flags = flags;
  	if ((namei_flags+1) & O_ACCMODE)
-@@ -651,14 +715,15 @@ struct file *filp_open(const char * file
+@@ -651,14 +715,15 @@
  	if (namei_flags & O_TRUNC)
  		namei_flags |= 2;
  
@@ -1365,7 +1365,7 @@ Index: linux-ia64/fs/open.c
  {
  	struct file * f;
  	struct inode *inode;
-@@ -695,7 +760,9 @@ struct file *dentry_open(struct dentry *
+@@ -695,7 +760,9 @@
  	}
  
  	if (f->f_op && f->f_op->open) {
@@ -1375,15 +1375,15 @@ Index: linux-ia64/fs/open.c
  		if (error)
  			goto cleanup_all;
  	}
-@@ -708,6 +775,7 @@ struct file *dentry_open(struct dentry *
- 					inode->i_mapping->a_ops->direct_sector_IO)))
- 		goto cleanup_all;
+@@ -711,6 +778,7 @@
+ 		}
+ 	}
  
 +	intent_release(it);
  	return f;
  
  cleanup_all:
-@@ -722,11 +790,17 @@ cleanup_all:
+@@ -725,11 +793,17 @@
  cleanup_file:
  	put_filp(f);
  cleanup_dentry:
@@ -1401,10 +1401,10 @@ Index: linux-ia64/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux-ia64/fs/stat.c
+Index: linux-2.4.21/fs/stat.c
 ===================================================================
---- linux-ia64.orig/fs/stat.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/fs/stat.c	2004-03-17 16:06:13.000000000 -0800
+--- linux-2.4.21.orig/fs/stat.c	2004-09-11 10:16:30.000000000 -0400
++++ linux-2.4.21/fs/stat.c	2004-09-16 19:38:49.000000000 -0400
 @@ -17,10 +17,12 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
@@ -1420,13 +1420,14 @@ Index: linux-ia64/fs/stat.c
  		return inode->i_op->revalidate(dentry);
  	return 0;
  }
-@@ -143,13 +145,15 @@ static int cp_new_stat(struct inode * in
+@@ -143,14 +145,16 @@
  asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf)
  {
  	struct nameidata nd;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
+ 	int error, errcnt = 0;
  
+ again:
 -	error = user_path_walk(filename, &nd);
 +	error = user_path_walk_it(filename, &nd, &it);
  	if (!error) {
@@ -1437,14 +1438,15 @@ Index: linux-ia64/fs/stat.c
 +		intent_release(&it);
  		path_release(&nd);
  	}
- 	return error;
-@@ -159,13 +163,15 @@ asmlinkage long sys_stat(char * filename
+ 	if (error == -ESTALE && !errcnt) {
+@@ -164,14 +168,16 @@
  asmlinkage long sys_newstat(char * filename, struct stat * statbuf)
  {
  	struct nameidata nd;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
+ 	int error, errcnt = 0;
  
+ again:
 -	error = user_path_walk(filename, &nd);
 +	error = user_path_walk_it(filename, &nd, &it);
  	if (!error) {
@@ -1455,14 +1457,15 @@ Index: linux-ia64/fs/stat.c
 +		intent_release(&it);
  		path_release(&nd);
  	}
- 	return error;
-@@ -180,13 +186,15 @@ asmlinkage long sys_newstat(char * filen
+ 	if (error == -ESTALE && !errcnt) {
+@@ -191,14 +197,16 @@
  asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf)
  {
  	struct nameidata nd;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
+ 	int error, errcnt = 0;
  
+ again:
 -	error = user_path_walk_link(filename, &nd);
 +	error = user_path_walk_link_it(filename, &nd, &it);
  	if (!error) {
@@ -1473,14 +1476,15 @@ Index: linux-ia64/fs/stat.c
 +		intent_release(&it);
  		path_release(&nd);
  	}
- 	return error;
-@@ -197,13 +205,15 @@ asmlinkage long sys_lstat(char * filenam
+ 	if (error == -ESTALE && !errcnt) {
+@@ -214,14 +222,16 @@
  asmlinkage long sys_newlstat(char * filename, struct stat * statbuf)
  {
  	struct nameidata nd;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
+ 	int error, errcnt = 0;
  
+ again:
 -	error = user_path_walk_link(filename, &nd);
 +	error = user_path_walk_link_it(filename, &nd, &it);
  	if (!error) {
@@ -1491,8 +1495,8 @@ Index: linux-ia64/fs/stat.c
 +		intent_release(&it);
  		path_release(&nd);
  	}
- 	return error;
-@@ -224,7 +234,7 @@ asmlinkage long sys_fstat(unsigned int f
+ 
+@@ -248,7 +258,7 @@
  	if (f) {
  		struct dentry * dentry = f->f_dentry;
  
@@ -1501,7 +1505,7 @@ Index: linux-ia64/fs/stat.c
  		if (!err)
  			err = cp_old_stat(dentry->d_inode, statbuf);
  		fput(f);
-@@ -243,7 +253,7 @@ asmlinkage long sys_newfstat(unsigned in
+@@ -267,7 +277,7 @@
  	if (f) {
  		struct dentry * dentry = f->f_dentry;
  
@@ -1510,7 +1514,7 @@ Index: linux-ia64/fs/stat.c
  		if (!err)
  			err = cp_new_stat(dentry->d_inode, statbuf);
  		fput(f);
-@@ -265,7 +275,7 @@ asmlinkage long sys_readlink(const char 
+@@ -289,7 +299,7 @@
  
  		error = -EINVAL;
  		if (inode->i_op && inode->i_op->readlink &&
@@ -1519,12 +1523,14 @@ Index: linux-ia64/fs/stat.c
  			UPDATE_ATIME(inode);
  			error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
  		}
-@@ -341,12 +351,14 @@ asmlinkage long sys_stat64(char * filena
+@@ -364,14 +374,16 @@
+ asmlinkage long sys_stat64(char * filename, struct stat64 * statbuf, long flags)
  {
  	struct nameidata nd;
- 	int error;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int error, errcnt = 0;
  
+ again:
 -	error = user_path_walk(filename, &nd);
 +	error = user_path_walk_it(filename, &nd, &it);
  	if (!error) {
@@ -1535,13 +1541,15 @@ Index: linux-ia64/fs/stat.c
 +		intent_release(&it);
  		path_release(&nd);
  	}
- 	return error;
-@@ -356,12 +368,14 @@ asmlinkage long sys_lstat64(char * filen
+ 	if (error == -ESTALE && !errcnt) {
+@@ -385,14 +397,16 @@
+ asmlinkage long sys_lstat64(char * filename, struct stat64 * statbuf, long flags)
  {
  	struct nameidata nd;
- 	int error;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int error, errcnt = 0;
  
+ again:
 -	error = user_path_walk_link(filename, &nd);
 +	error = user_path_walk_link_it(filename, &nd, &it);
  	if (!error) {
@@ -1552,8 +1560,8 @@ Index: linux-ia64/fs/stat.c
 +		intent_release(&it);
  		path_release(&nd);
  	}
- 	return error;
-@@ -376,7 +390,7 @@ asmlinkage long sys_fstat64(unsigned lon
+ 	if (error == -ESTALE && !errcnt) {
+@@ -412,7 +426,7 @@
  	if (f) {
  		struct dentry * dentry = f->f_dentry;
  
@@ -1562,10 +1570,10 @@ Index: linux-ia64/fs/stat.c
  		if (!err)
  			err = cp_new_stat64(dentry->d_inode, statbuf);
  		fput(f);
-Index: linux-ia64/include/linux/dcache.h
+Index: linux-2.4.21/include/linux/dcache.h
 ===================================================================
---- linux-ia64.orig/include/linux/dcache.h	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/include/linux/dcache.h	2004-03-17 16:05:28.000000000 -0800
+--- linux-2.4.21.orig/include/linux/dcache.h	2004-09-11 10:16:39.000000000 -0400
++++ linux-2.4.21/include/linux/dcache.h	2004-09-16 19:32:11.000000000 -0400
 @@ -6,6 +6,51 @@
  #include <asm/atomic.h>
  #include <linux/mount.h>
@@ -1618,7 +1626,7 @@ Index: linux-ia64/include/linux/dcache.h
  
  /*
   * linux/include/linux/dcache.h
-@@ -96,8 +141,22 @@ struct dentry_operations {
+@@ -96,8 +141,22 @@
  	int (*d_delete)(struct dentry *);
  	void (*d_release)(struct dentry *);
  	void (*d_iput)(struct dentry *, struct inode *);
@@ -1641,7 +1649,7 @@ Index: linux-ia64/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
-@@ -129,6 +188,7 @@ d_iput:		no		no		yes
+@@ -129,6 +188,7 @@
  					 * s_nfsd_free_path semaphore will be down
  					 */
  #define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
@@ -1649,11 +1657,11 @@ Index: linux-ia64/include/linux/dcache.h
  
  extern spinlock_t dcache_lock;
  
-Index: linux-ia64/include/linux/fs.h
+Index: linux-2.4.21/include/linux/fs.h
 ===================================================================
---- linux-ia64.orig/include/linux/fs.h	2004-03-17 16:05:28.000000000 -0800
-+++ linux-ia64/include/linux/fs.h	2004-03-17 16:05:52.000000000 -0800
-@@ -73,6 +73,7 @@ extern int leases_enable, dir_notify_ena
+--- linux-2.4.21.orig/include/linux/fs.h	2004-09-16 19:21:00.000000000 -0400
++++ linux-2.4.21/include/linux/fs.h	2004-09-16 19:32:11.000000000 -0400
+@@ -73,6 +73,7 @@
  
  #define FMODE_READ 1
  #define FMODE_WRITE 2
@@ -1661,7 +1669,7 @@ Index: linux-ia64/include/linux/fs.h
  
  #define READ 0
  #define WRITE 1
-@@ -359,6 +360,9 @@ extern void set_bh_page(struct buffer_he
+@@ -362,6 +363,9 @@
  #define ATTR_MTIME_SET	256
  #define ATTR_FORCE	512	/* Not a change, but a change it */
  #define ATTR_ATTR_FLAG	1024
@@ -1671,7 +1679,7 @@ Index: linux-ia64/include/linux/fs.h
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -496,6 +500,7 @@ struct inode {
+@@ -499,6 +503,7 @@
  	struct pipe_inode_info	*i_pipe;
  	struct block_device	*i_bdev;
  	struct char_device	*i_cdev;
@@ -1679,7 +1687,7 @@ Index: linux-ia64/include/linux/fs.h
  
  	unsigned long		i_dnotify_mask; /* Directory notify events */
  	struct dnotify_struct	*i_dnotify; /* for directory notifications */
-@@ -598,6 +603,7 @@ struct file {
+@@ -601,6 +606,7 @@
  
  	/* needed for tty driver, and maybe others */
  	void			*private_data;
@@ -1687,7 +1695,7 @@ Index: linux-ia64/include/linux/fs.h
  
  	/* preallocated helper kiobuf to speedup O_DIRECT */
  	struct kiobuf		*f_iobuf;
-@@ -726,6 +732,7 @@ struct nameidata {
+@@ -729,6 +735,7 @@
  	struct qstr last;
  	unsigned int flags;
  	int last_type;
@@ -1695,7 +1703,7 @@ Index: linux-ia64/include/linux/fs.h
  };
  
  /*
-@@ -846,7 +853,8 @@ extern int vfs_symlink(struct inode *, s
+@@ -849,7 +856,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 *);
@@ -1705,7 +1713,7 @@ Index: linux-ia64/include/linux/fs.h
  
  /*
   * File types
-@@ -920,21 +928,32 @@ struct file_operations {
+@@ -928,21 +936,32 @@
  
  struct inode_operations {
  	int (*create) (struct inode *,struct dentry *,int);
@@ -1738,7 +1746,7 @@ Index: linux-ia64/include/linux/fs.h
  	int (*getattr) (struct dentry *, struct iattr *);
  	int (*setxattr) (struct dentry *, const char *, const void *, size_t, int);
  	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
-@@ -1131,10 +1150,14 @@ static inline int get_lease(struct inode
+@@ -1139,10 +1158,14 @@
  
  asmlinkage long sys_open(const char *, int, int);
  asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
@@ -1754,7 +1762,7 @@ Index: linux-ia64/include/linux/fs.h
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char *);
  
-@@ -1425,6 +1448,7 @@ typedef int (*read_actor_t)(read_descrip
+@@ -1434,6 +1457,7 @@
  extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
  
  extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
@@ -1762,7 +1770,7 @@ Index: linux-ia64/include/linux/fs.h
  extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
  extern int FASTCALL(path_walk(const char *, struct nameidata *));
  extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
-@@ -1436,6 +1460,8 @@ extern struct dentry * lookup_one_len(co
+@@ -1445,6 +1469,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)
@@ -1771,7 +1779,7 @@ Index: linux-ia64/include/linux/fs.h
  
  extern void inode_init_once(struct inode *);
  extern void iput(struct inode *);
-@@ -1599,6 +1625,8 @@ extern struct file_operations generic_ro
+@@ -1609,6 +1635,8 @@
  
  extern int vfs_readlink(struct dentry *, char *, int, const char *);
  extern int vfs_follow_link(struct nameidata *, const char *);
@@ -1780,11 +1788,11 @@ Index: linux-ia64/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-ia64/include/linux/fs_struct.h
+Index: linux-2.4.21/include/linux/fs_struct.h
 ===================================================================
---- linux-ia64.orig/include/linux/fs_struct.h	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/include/linux/fs_struct.h	2004-03-17 16:05:28.000000000 -0800
-@@ -37,10 +37,12 @@ static inline void set_fs_root(struct fs
+--- linux-2.4.21.orig/include/linux/fs_struct.h	2004-09-11 10:16:14.000000000 -0400
++++ linux-2.4.21/include/linux/fs_struct.h	2004-09-16 19:32:11.000000000 -0400
+@@ -37,10 +37,12 @@
  	write_lock(&fs->lock);
  	old_root = fs->root;
  	old_rootmnt = fs->rootmnt;
@@ -1797,7 +1805,7 @@ Index: linux-ia64/include/linux/fs_struct.h
  		dput(old_root);
  		mntput(old_rootmnt);
  	}
-@@ -60,10 +62,12 @@ static inline void set_fs_pwd(struct fs_
+@@ -60,10 +62,12 @@
  	write_lock(&fs->lock);
  	old_pwd = fs->pwd;
  	old_pwdmnt = fs->pwdmnt;
@@ -1810,11 +1818,11 @@ Index: linux-ia64/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux-ia64/kernel/exit.c
+Index: linux-2.4.21/kernel/exit.c
 ===================================================================
---- linux-ia64.orig/kernel/exit.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/kernel/exit.c	2004-03-17 16:05:28.000000000 -0800
-@@ -347,11 +347,14 @@ static inline void __put_fs_struct(struc
+--- linux-2.4.21.orig/kernel/exit.c	2004-09-11 10:16:35.000000000 -0400
++++ linux-2.4.21/kernel/exit.c	2004-09-16 19:32:11.000000000 -0400
+@@ -367,11 +367,14 @@
  {
  	/* No need to hold fs->lock if we are killing it */
  	if (atomic_dec_and_test(&fs->count)) {
@@ -1829,11 +1837,11 @@ Index: linux-ia64/kernel/exit.c
  			dput(fs->altroot);
  			mntput(fs->altrootmnt);
  		}
-Index: linux-ia64/kernel/fork.c
+Index: linux-2.4.21/kernel/fork.c
 ===================================================================
---- linux-ia64.orig/kernel/fork.c	2004-03-17 15:47:15.000000000 -0800
-+++ linux-ia64/kernel/fork.c	2004-03-17 16:05:28.000000000 -0800
-@@ -463,10 +463,13 @@ static inline struct fs_struct *__copy_f
+--- linux-2.4.21.orig/kernel/fork.c	2004-09-11 10:16:39.000000000 -0400
++++ linux-2.4.21/kernel/fork.c	2004-09-16 19:32:11.000000000 -0400
+@@ -472,10 +472,13 @@
  		fs->umask = old->umask;
  		read_lock(&old->lock);
  		fs->rootmnt = mntget(old->rootmnt);
@@ -1847,11 +1855,11 @@ Index: linux-ia64/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux-ia64/kernel/ksyms.c
+Index: linux-2.4.21/kernel/ksyms.c
 ===================================================================
---- linux-ia64.orig/kernel/ksyms.c	2004-03-17 16:05:28.000000000 -0800
-+++ linux-ia64/kernel/ksyms.c	2004-03-17 16:05:51.000000000 -0800
-@@ -318,6 +318,7 @@ EXPORT_SYMBOL(read_cache_page);
+--- linux-2.4.21.orig/kernel/ksyms.c	2004-09-16 19:21:00.000000000 -0400
++++ linux-2.4.21/kernel/ksyms.c	2004-09-16 19:32:11.000000000 -0400
+@@ -317,6 +317,7 @@
  EXPORT_SYMBOL(set_page_dirty);
  EXPORT_SYMBOL(vfs_readlink);
  EXPORT_SYMBOL(vfs_follow_link);
diff --git a/lustre/kernel_patches/series/rhel-2.4.21 b/lustre/kernel_patches/series/rhel-2.4.21
index b006991..456c87f 100644
--- a/lustre/kernel_patches/series/rhel-2.4.21
+++ b/lustre/kernel_patches/series/rhel-2.4.21
@@ -6,7 +6,7 @@ vfs_intent-2.4.21-rhel.patch
 invalidate_show-2.4.20-rh.patch
 iod-rmap-exports-2.4.21-chaos.patch 
 export-truncate.patch
-ext3-htree-2.4.21-chaos.patch 
+ext3-htree-2.4.21-rhel.patch 
 linux-2.4.21-xattr-0.8.54-chaos.patch 
 ext3-ino_sb_macro-2.4.21-chaos.patch
 ext3-orphan_lock-2.4.22-rh.patch
@@ -40,5 +40,6 @@ ext3-extents-2.4.21-chaos.patch
 ext3-extents-asyncdel-2.4.21-chaos.patch 
 ext3-mballoc-2.4.21-chaos.patch 
 blkdev_tunables-2.4.21-chaos.patch
-small_scatterlist-2.4.21-chaos.patch
+small_scatterlist-2.4.21-rhel.patch 
 ext3-nlinks-2.4.21-chaos.patch
+sd_iostats-2.4.21-chaos.patch
-- 
1.8.3.1