X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fkernel_patches%2Fpatches%2Fvfs_intent-2.4.18-18.patch;h=5c1f090c1ac565e5c5a5b797946b5a1fb35a9ffa;hb=040033cef24c5aca2967daf2da7a862abcd074cf;hp=738467551eccdf55ba8435d15ca4fc04ad9d72ab;hpb=5c0b2855f617d17e3c0749244edeca1b706f8a7e;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch
index 7384675..5c1f090 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18.patch
@@ -1,15 +1,16 @@
- fs/dcache.c            |    8 +
- fs/namei.c             |  288 ++++++++++++++++++++++++++++++++++++++++---------
+ fs/dcache.c            |   20 ++
+ fs/exec.c              |   18 +-
+ fs/namei.c             |  338 ++++++++++++++++++++++++++++++++++++++++---------
  fs/nfsd/vfs.c          |    2 
- fs/open.c              |   53 +++++++--
- fs/stat.c              |    9 +
- include/linux/dcache.h |   25 ++++
- include/linux/fs.h     |   22 +++
+ fs/open.c              |  120 +++++++++++++++--
+ fs/stat.c              |    8 -
+ include/linux/dcache.h |   28 ++++
+ include/linux/fs.h     |   27 +++
  kernel/ksyms.c         |    1 
- 8 files changed, 345 insertions(+), 63 deletions(-)
+ 9 files changed, 478 insertions(+), 84 deletions(-)
 
---- linux-2.4.18-49chaos-lustre9/fs/dcache.c~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/fs/dcache.c	Wed Jan 29 12:43:32 2003
+--- linux-2.4.18-18.8.0-l12/fs/dcache.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/fs/dcache.c	Wed Feb 26 17:31:36 2003
 @@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry)
  		spin_unlock(&dcache_lock);
  		return 0;
@@ -32,8 +33,31 @@
  	INIT_LIST_HEAD(&dentry->d_hash);
  	INIT_LIST_HEAD(&dentry->d_lru);
  	INIT_LIST_HEAD(&dentry->d_subdirs);
---- linux-2.4.18-49chaos-lustre9/fs/namei.c~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/fs/namei.c	Wed Feb  5 16:23:06 2003
+@@ -859,13 +867,19 @@ void d_delete(struct dentry * dentry)
+  * Adds a dentry to the hash according to its name.
+  */
+  
+-void d_rehash(struct dentry * entry)
++void __d_rehash(struct dentry * entry, int lock)
+ {
+ 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
+ 	if (!list_empty(&entry->d_hash)) BUG();
+-	spin_lock(&dcache_lock);
++	if (lock) spin_lock(&dcache_lock);
+ 	list_add(&entry->d_hash, list);
+-	spin_unlock(&dcache_lock);
++	if (lock) spin_unlock(&dcache_lock);
++}
++EXPORT_SYMBOL(__d_rehash);
++
++void d_rehash(struct dentry * entry)
++{
++	__d_rehash(entry, 1);
+ }
+ 
+ #define do_switch(x,y) do { \
+--- linux-2.4.18-18.8.0-l12/fs/namei.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/fs/namei.c	Wed Feb 26 16:54:17 2003
 @@ -94,6 +94,13 @@
   * XEmacs seems to be relying on it...
   */
@@ -134,7 +158,53 @@
  	path_release(nd);
  	return -ELOOP;
  }
-@@ -449,7 +482,8 @@ static inline void follow_dotdot(struct 
+@@ -381,15 +414,26 @@ int follow_up(struct vfsmount **mnt, str
+ 	return __follow_up(mnt, dentry);
+ }
+ 
+-static inline int __follow_down(struct vfsmount **mnt, struct dentry **dentry)
++static inline int __follow_down(struct vfsmount **mnt, struct dentry **dentry,
++				struct lookup_intent *it)
+ {
+ 	struct vfsmount *mounted;
+ 
+ 	spin_lock(&dcache_lock);
+ 	mounted = lookup_mnt(*mnt, *dentry);
+ 	if (mounted) {
++		int opc = 0, mode = 0;
+ 		*mnt = mntget(mounted);
+ 		spin_unlock(&dcache_lock);
++		if (it) {
++			opc = it->it_op;
++			mode = it->it_mode;
++		}
++		intent_release(*dentry, it);
++		if (it) {
++			it->it_op = opc;
++			it->it_mode = mode;
++		}
+ 		dput(*dentry);
+ 		mntput(mounted->mnt_parent);
+ 		*dentry = dget(mounted->mnt_root);
+@@ -401,7 +445,7 @@ static inline int __follow_down(struct v
+ 
+ int follow_down(struct vfsmount **mnt, struct dentry **dentry)
+ {
+-	return __follow_down(mnt,dentry);
++	return __follow_down(mnt,dentry,NULL);
+ }
+  
+ static inline void follow_dotdot(struct nameidata *nd)
+@@ -437,7 +481,7 @@ static inline void follow_dotdot(struct 
+ 		mntput(nd->mnt);
+ 		nd->mnt = parent;
+ 	}
+-	while (d_mountpoint(nd->dentry) && __follow_down(&nd->mnt, &nd->dentry))
++	while (d_mountpoint(nd->dentry) && __follow_down(&nd->mnt, &nd->dentry, NULL))
+ 		;
+ }
+ 
+@@ -449,7 +493,8 @@ static inline void follow_dotdot(struct 
   *
   * We expect 'base' to be positive and a directory.
   */
@@ -144,7 +214,7 @@
  {
  	struct dentry *dentry;
  	struct inode *inode;
-@@ -526,12 +560,12 @@ int link_path_walk(const char * name, st
+@@ -526,18 +571,18 @@ int link_path_walk(const char * name, st
  				break;
  		}
  		/* This does the actual lookups.. */
@@ -159,7 +229,14 @@
  			err = PTR_ERR(dentry);
  			if (IS_ERR(dentry))
  				break;
-@@ -548,8 +582,8 @@ int link_path_walk(const char * name, st
+ 		}
+ 		/* Check mountpoints.. */
+-		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry))
++		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, NULL))
+ 			;
+ 
+ 		err = -ENOENT;
+@@ -548,8 +593,8 @@ int link_path_walk(const char * name, st
  		if (!inode->i_op)
  			goto out_dput;
  
@@ -170,7 +247,7 @@
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -565,7 +599,7 @@ int link_path_walk(const char * name, st
+@@ -565,7 +610,7 @@ int link_path_walk(const char * name, st
  			nd->dentry = dentry;
  		}
  		err = -ENOTDIR; 
@@ -179,7 +256,7 @@
  			break;
  		continue;
  		/* here ends the main loop */
-@@ -592,12 +626,12 @@ last_component:
+@@ -592,22 +637,23 @@ last_component:
  			if (err < 0)
  				break;
  		}
@@ -194,7 +271,9 @@
  			err = PTR_ERR(dentry);
  			if (IS_ERR(dentry))
  				break;
-@@ -606,8 +640,9 @@ last_component:
+ 		}
+-		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry))
++		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, it))
  			;
  		inode = dentry->d_inode;
  		if ((lookup_flags & LOOKUP_FOLLOW)
@@ -206,7 +285,7 @@
  			dput(dentry);
  			if (err)
  				goto return_err;
-@@ -621,7 +656,8 @@ last_component:
+@@ -621,7 +667,8 @@ last_component:
  			goto no_inode;
  		if (lookup_flags & LOOKUP_DIRECTORY) {
  			err = -ENOTDIR; 
@@ -216,7 +295,7 @@
  				break;
  		}
  		goto return_base;
-@@ -658,15 +694,28 @@ out_dput:
+@@ -658,15 +705,28 @@ out_dput:
  		dput(dentry);
  		break;
  	}
@@ -246,7 +325,7 @@
  }
  
  /* SMP-safe */
-@@ -751,6 +800,17 @@ walk_init_root(const char *name, struct 
+@@ -751,6 +811,17 @@ walk_init_root(const char *name, struct 
  }
  
  /* SMP-safe */
@@ -264,7 +343,7 @@
  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
  {
  	int error = 0;
-@@ -779,7 +839,8 @@ int path_init(const char *name, unsigned
+@@ -779,7 +850,8 @@ int path_init(const char *name, unsigned
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -274,7 +353,7 @@
  {
  	struct dentry * dentry;
  	struct inode *inode;
-@@ -802,13 +863,16 @@ struct dentry * lookup_hash(struct qstr 
+@@ -802,13 +874,16 @@ struct dentry * lookup_hash(struct qstr 
  			goto out;
  	}
  
@@ -292,7 +371,7 @@
  		dentry = inode->i_op->lookup(inode, new);
  		unlock_kernel();
  		if (!dentry)
-@@ -820,6 +884,12 @@ out:
+@@ -820,6 +895,12 @@ out:
  	return dentry;
  }
  
@@ -305,7 +384,7 @@
  /* SMP-safe */
  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
  {
-@@ -841,7 +911,7 @@ struct dentry * lookup_one_len(const cha
+@@ -841,7 +922,7 @@ struct dentry * lookup_one_len(const cha
  	}
  	this.hash = end_name_hash(hash);
  
@@ -314,7 +393,7 @@
  access:
  	return ERR_PTR(-EACCES);
  }
-@@ -872,6 +942,23 @@ int __user_walk(const char *name, unsign
+@@ -872,6 +953,23 @@ int __user_walk(const char *name, unsign
  	return err;
  }
  
@@ -338,7 +417,7 @@
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -1045,14 +1132,17 @@ int may_open(struct nameidata *nd, int a
+@@ -1045,14 +1143,17 @@ int may_open(struct nameidata *nd, int a
          return get_lease(inode, flag);
  }
  
@@ -357,7 +436,7 @@
  	int count = 0;
  
  	if ((flag+1) & O_ACCMODE)
-@@ -1066,7 +1156,7 @@ struct file *filp_open(const char * path
+@@ -1066,7 +1167,7 @@ struct file *filp_open(const char * path
  	 * The simplest case - just a plain lookup.
  	 */
  	if (!(flag & O_CREAT)) {
@@ -366,7 +445,7 @@
  		if (error)
  			return ERR_PTR(error);
  		dentry = nd.dentry;
-@@ -1076,6 +1166,8 @@ struct file *filp_open(const char * path
+@@ -1076,6 +1177,8 @@ struct file *filp_open(const char * path
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -375,7 +454,7 @@
  	error = path_lookup(pathname, LOOKUP_PARENT, &nd);
  	if (error)
  		return ERR_PTR(error);
-@@ -1091,7 +1183,7 @@ struct file *filp_open(const char * path
+@@ -1091,7 +1194,7 @@ struct file *filp_open(const char * path
  
  	dir = nd.dentry;
  	down(&dir->d_inode->i_sem);
@@ -384,7 +463,7 @@
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1100,6 +1192,7 @@ do_last:
+@@ -1100,6 +1203,7 @@ do_last:
  		goto exit;
  	}
  
@@ -392,7 +471,13 @@
  	/* Negative dentry, just create the file */
  	if (!dentry->d_inode) {
  		error = vfs_create(dir->d_inode, dentry,
-@@ -1134,7 +1227,8 @@ do_last:
+@@ -1129,12 +1233,13 @@ do_last:
+ 		error = -ELOOP;
+ 		if (flag & O_NOFOLLOW)
+ 			goto exit_dput;
+-		while (__follow_down(&nd.mnt,&dentry) && d_mountpoint(dentry));
++		while (__follow_down(&nd.mnt,&dentry,&it) && d_mountpoint(dentry));
+ 	}
  	error = -ENOENT;
  	if (!dentry->d_inode)
  		goto exit_dput;
@@ -402,7 +487,7 @@
  		goto do_link;
  
  	dput(nd.dentry);
-@@ -1149,11 +1243,13 @@ ok:
+@@ -1149,11 +1254,13 @@ ok:
  	if (!S_ISREG(nd.dentry->d_inode->i_mode))
  		open_flags &= ~O_TRUNC;
  
@@ -417,7 +502,7 @@
  	path_release(&nd);
  	return ERR_PTR(error);
  
-@@ -1172,7 +1268,12 @@ do_link:
+@@ -1172,10 +1279,15 @@ do_link:
  	 * are done. Procfs-like symlinks just set LAST_BIND.
  	 */
  	UPDATE_ATIME(dentry->d_inode);
@@ -430,8 +515,12 @@
 +		intent_release(dentry, &it);
  	dput(dentry);
  	if (error)
- 		return error;
-@@ -1194,13 +1295,15 @@ do_link:
+-		return error;
++		return ERR_PTR(error);
+ 	if (nd.last_type == LAST_BIND) {
+ 		dentry = nd.dentry;
+ 		goto ok;
+@@ -1194,13 +1306,15 @@ do_link:
  	}
  	dir = nd.dentry;
  	down(&dir->d_inode->i_sem);
@@ -449,7 +538,7 @@
  {
  	struct dentry *dentry;
  
-@@ -1208,7 +1311,7 @@ static struct dentry *lookup_create(stru
+@@ -1208,7 +1322,7 @@ static struct dentry *lookup_create(stru
  	dentry = ERR_PTR(-EEXIST);
  	if (nd->last_type != LAST_NORM)
  		goto fail;
@@ -458,7 +547,7 @@
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1264,7 +1367,19 @@ asmlinkage long sys_mknod(const char * f
+@@ -1264,7 +1378,19 @@ asmlinkage long sys_mknod(const char * f
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
@@ -470,7 +559,7 @@
 +				   nd.last.name,
 +				   nd.last.len,
 +				   mode, dev);
-+		/* the file system want to use normal vfs path now */
++		/* the file system wants to use normal vfs path now */
 +		if (error != -EOPNOTSUPP)
 +			goto out2;
 +	}
@@ -479,7 +568,7 @@
  	error = PTR_ERR(dentry);
  
  	mode &= ~current->fs->umask;
-@@ -1285,6 +1400,7 @@ asmlinkage long sys_mknod(const char * f
+@@ -1285,6 +1411,7 @@ asmlinkage long sys_mknod(const char * f
  		dput(dentry);
  	}
  	up(&nd.dentry->d_inode->i_sem);
@@ -487,7 +576,7 @@
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1332,7 +1448,17 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1332,7 +1459,17 @@ asmlinkage long sys_mkdir(const char * p
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
@@ -498,7 +587,7 @@
 +					   nd.last.name,
 +					   nd.last.len,
 +					   mode);
-+			/* the file system want to use normal vfs path now */
++			/* the file system wants to use normal vfs path now */
 +			if (error != -EOPNOTSUPP)
 +				goto out2;
 +		}
@@ -506,7 +595,7 @@
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
  			error = vfs_mkdir(nd.dentry->d_inode, dentry,
-@@ -1340,6 +1466,7 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1340,6 +1477,7 @@ asmlinkage long sys_mkdir(const char * p
  			dput(dentry);
  		}
  		up(&nd.dentry->d_inode->i_sem);
@@ -514,16 +603,32 @@
  		path_release(&nd);
  out:
  		putname(tmp);
-@@ -1440,8 +1567,17 @@ asmlinkage long sys_rmdir(const char * p
+@@ -1440,8 +1578,33 @@ asmlinkage long sys_rmdir(const char * p
  			error = -EBUSY;
  			goto exit1;
  	}
 +	if (nd.dentry->d_inode->i_op->rmdir2) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
++		struct dentry *last;
++
++		down(&nd.dentry->d_inode->i_sem);
++		last = lookup_hash_it(&nd.last, nd.dentry, NULL);
++		up(&nd.dentry->d_inode->i_sem);
++		if (IS_ERR(last)) {
++			error = PTR_ERR(last);
++			goto exit1;
++		}
++		if (d_mountpoint(last)) {
++			dput(last);
++			error = -EBUSY;
++			goto exit1;
++		}
++		dput(last);
++
 +		error = op->rmdir2(nd.dentry->d_inode,
 +				   nd.last.name,
 +				   nd.last.len);
-+		/* the file system want to use normal vfs path now */
++		/* the file system wants to use normal vfs path now */
 +		if (error != -EOPNOTSUPP)
 +			goto exit1;
 +	}
@@ -533,7 +638,7 @@
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1499,8 +1635,17 @@ asmlinkage long sys_unlink(const char * 
+@@ -1499,8 +1662,17 @@ asmlinkage long sys_unlink(const char * 
  	error = -EISDIR;
  	if (nd.last_type != LAST_NORM)
  		goto exit1;
@@ -542,7 +647,7 @@
 +		error = op->unlink2(nd.dentry->d_inode,
 +				    nd.last.name,
 +				    nd.last.len);
-+		/* the file system want to use normal vfs path now */
++		/* the file system wants to use normal vfs path now */
 +		if (error != -EOPNOTSUPP)
 +			goto exit1;
 +	}
@@ -552,7 +657,7 @@
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1567,15 +1712,26 @@ asmlinkage long sys_symlink(const char *
+@@ -1567,15 +1739,26 @@ asmlinkage long sys_symlink(const char *
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
@@ -563,7 +668,7 @@
 +					     nd.last.name,
 +					     nd.last.len,
 +					     from);
-+			/* the file system want to use normal vfs path now */
++			/* the file system wants to use normal vfs path now */
 +			if (error != -EOPNOTSUPP)
 +				goto out2;
 +		}
@@ -581,7 +686,7 @@
  		putname(to);
  	}
  	putname(from);
-@@ -1642,7 +1798,7 @@ asmlinkage long sys_link(const char * ol
+@@ -1642,7 +1825,7 @@ asmlinkage long sys_link(const char * ol
  		struct dentry *new_dentry;
  		struct nameidata nd, old_nd;
  
@@ -590,7 +695,7 @@
  		if (error)
  			goto exit;
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
-@@ -1651,7 +1807,17 @@ asmlinkage long sys_link(const char * ol
+@@ -1651,7 +1834,17 @@ asmlinkage long sys_link(const char * ol
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
@@ -601,7 +706,7 @@
 +					  nd.dentry->d_inode,
 +					  nd.last.name,
 +					  nd.last.len);
-+			/* the file system want to use normal vfs path now */
++			/* the file system wants to use normal vfs path now */
 +			if (error != -EOPNOTSUPP)
 +				goto out_release;
 +		}
@@ -609,7 +714,7 @@
  		error = PTR_ERR(new_dentry);
  		if (!IS_ERR(new_dentry)) {
  			error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-@@ -1695,7 +1861,8 @@ exit:
+@@ -1695,7 +1888,8 @@ exit:
   *	   locking].
   */
  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
@@ -619,7 +724,7 @@
  {
  	int error;
  	struct inode *target;
-@@ -1753,6 +1920,7 @@ int vfs_rename_dir(struct inode *old_dir
+@@ -1753,6 +1947,7 @@ int vfs_rename_dir(struct inode *old_dir
  		error = -EBUSY;
  	else 
  		error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
@@ -627,7 +732,7 @@
  	if (target) {
  		if (!error)
  			target->i_flags |= S_DEAD;
-@@ -1774,7 +1942,8 @@ out_unlock:
+@@ -1774,7 +1969,8 @@ out_unlock:
  }
  
  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
@@ -637,7 +742,7 @@
  {
  	int error;
  
-@@ -1805,6 +1974,7 @@ int vfs_rename_other(struct inode *old_d
+@@ -1805,6 +2001,7 @@ int vfs_rename_other(struct inode *old_d
  		error = -EBUSY;
  	else
  		error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
@@ -645,7 +750,7 @@
  	double_up(&old_dir->i_zombie, &new_dir->i_zombie);
  	if (error)
  		return error;
-@@ -1816,13 +1986,14 @@ int vfs_rename_other(struct inode *old_d
+@@ -1816,13 +2013,14 @@ int vfs_rename_other(struct inode *old_d
  }
  
  int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
@@ -663,24 +768,8 @@
  	if (!error) {
  		if (old_dir == new_dir)
  			inode_dir_notify(old_dir, DN_RENAME);
-@@ -1862,9 +2033,23 @@ static inline int do_rename(const char *
- 	if (newnd.last_type != LAST_NORM)
- 		goto exit2;
+@@ -1864,7 +2062,7 @@ static inline int do_rename(const char *
  
-+	if (old_dir->d_inode->i_op->rename2) {
-+		lock_kernel();
-+		error = old_dir->d_inode->i_op->rename2(old_dir->d_inode,
-+							new_dir->d_inode,
-+							oldnd.last.name,
-+							oldnd.last.len,
-+							newnd.last.name,
-+							newnd.last.len);
-+		unlock_kernel();
-+		/* the file system want to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto exit2;
-+	}
-+
  	double_lock(new_dir, old_dir);
  
 -	old_dentry = lookup_hash(&oldnd.last, old_dir);
@@ -688,7 +777,7 @@
  	error = PTR_ERR(old_dentry);
  	if (IS_ERR(old_dentry))
  		goto exit3;
-@@ -1880,14 +2065,14 @@ static inline int do_rename(const char *
+@@ -1880,16 +2078,37 @@ static inline int do_rename(const char *
  		if (newnd.last.name[newnd.last.len])
  			goto exit4;
  	}
@@ -698,14 +787,38 @@
  	if (IS_ERR(new_dentry))
  		goto exit4;
  
++	if (old_dir->d_inode->i_op->rename2) {
++		lock_kernel();
++		/* don't rename mount point. mds will take care of
++		 * the rest sanity checking */
++		if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry)) {
++			error = -EBUSY;
++			goto exit5;
++		}
++
++		error = old_dir->d_inode->i_op->rename2(old_dir->d_inode,
++							new_dir->d_inode,
++							oldnd.last.name,
++							oldnd.last.len,
++							newnd.last.name,
++							newnd.last.len);
++		unlock_kernel();
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto exit5;
++	}
++
  	lock_kernel();
  	error = vfs_rename(old_dir->d_inode, old_dentry,
 -				   new_dir->d_inode, new_dentry);
 +				   new_dir->d_inode, new_dentry, NULL);
  	unlock_kernel();
- 
+-
++exit5:
  	dput(new_dentry);
-@@ -1940,7 +2125,8 @@ out:
+ exit4:
+ 	dput(old_dentry);
+@@ -1940,7 +2159,8 @@ out:
  }
  
  static inline int
@@ -715,7 +828,7 @@
  {
  	int res = 0;
  	char *name;
-@@ -1953,7 +2139,7 @@ __vfs_follow_link(struct nameidata *nd, 
+@@ -1953,7 +2173,7 @@ __vfs_follow_link(struct nameidata *nd, 
  			/* weird __emul_prefix() stuff did it */
  			goto out;
  	}
@@ -724,7 +837,7 @@
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
  		return res;
-@@ -1975,7 +2161,13 @@ fail:
+@@ -1975,7 +2195,13 @@ fail:
  
  int vfs_follow_link(struct nameidata *nd, const char *link)
  {
@@ -739,7 +852,7 @@
  }
  
  /* get the link contents into pagecache */
-@@ -2017,7 +2209,7 @@ int page_follow_link(struct dentry *dent
+@@ -2017,7 +2243,7 @@ int page_follow_link(struct dentry *dent
  {
  	struct page *page = NULL;
  	char *s = page_getlink(dentry, &page);
@@ -748,8 +861,8 @@
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
---- linux-2.4.18-49chaos-lustre9/fs/nfsd/vfs.c~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/fs/nfsd/vfs.c	Wed Jan 29 12:43:32 2003
+--- linux-2.4.18-18.8.0-l12/fs/nfsd/vfs.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/fs/nfsd/vfs.c	Wed Feb 26 16:54:17 2003
 @@ -1298,7 +1298,7 @@ nfsd_rename(struct svc_rqst *rqstp, stru
  			err = nfserr_perm;
  	} else
@@ -759,23 +872,50 @@
  	unlock_kernel();
  	if (!err && EX_ISSYNC(tfhp->fh_export)) {
  		nfsd_sync_dir(tdentry);
---- linux-2.4.18-49chaos-lustre9/fs/open.c~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/fs/open.c	Wed Jan 29 12:43:32 2003
-@@ -19,6 +19,9 @@
+--- linux-2.4.18-18.8.0-l12/fs/open.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/fs/open.c	Wed Feb 26 16:54:17 2003
+@@ -19,6 +19,8 @@
  #include <asm/uaccess.h>
  
  #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
 +extern int path_walk_it(const char *name, struct nameidata *nd,
 +			struct lookup_intent *it);
-+extern void intent_release(struct dentry *de, struct lookup_intent *it);
  
  int vfs_statfs(struct super_block *sb, struct statfs *buf)
  {
-@@ -118,12 +121,13 @@ static inline long do_sys_truncate(const
+@@ -95,9 +97,10 @@ void fd_install(unsigned int fd, struct 
+ 	write_unlock(&files->file_lock);
+ }
+ 
+-int do_truncate(struct dentry *dentry, loff_t length)
++int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
+ {
+ 	struct inode *inode = dentry->d_inode;
++	struct inode_operations *op = dentry->d_inode->i_op;
+ 	int error;
+ 	struct iattr newattrs;
+ 
+@@ -108,7 +111,14 @@ int do_truncate(struct dentry *dentry, l
+ 	down(&inode->i_sem);
+ 	newattrs.ia_size = length;
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+-	error = notify_change(dentry, &newattrs);
++	if (called_from_open)
++		newattrs.ia_valid |= ATTR_FROM_OPEN;
++	if (op->setattr_raw) {
++		newattrs.ia_valid |= ATTR_RAW;
++		newattrs.ia_ctime = CURRENT_TIME;
++		error = op->setattr_raw(inode, &newattrs);
++	} else 
++		error = notify_change(dentry, &newattrs);
+ 	up(&inode->i_sem);
+ 	return error;
+ }
+@@ -118,12 +128,13 @@ static inline long do_sys_truncate(const
  	struct nameidata nd;
  	struct inode * inode;
  	int error;
-+	struct lookup_intent it = { .it_op = IT_TRUNC };
++	struct lookup_intent it = { .it_op = IT_GETATTR };
  
  	error = -EINVAL;
  	if (length < 0)	/* sorry, but loff_t says... */
@@ -786,7 +926,14 @@
  	if (error)
  		goto out;
  	inode = nd.dentry->d_inode;
-@@ -168,6 +172,7 @@ static inline long do_sys_truncate(const
+@@ -163,11 +174,13 @@ static inline long do_sys_truncate(const
+ 	error = locks_verify_truncate(inode, NULL, length);
+ 	if (!error) {
+ 		DQUOT_INIT(inode);
+-		error = do_truncate(nd.dentry, length);
++		intent_release(nd.dentry, &it);
++		error = do_truncate(nd.dentry, length, 0);
+ 	}
  	put_write_access(inode);
  
  dput_and_out:
@@ -794,45 +941,100 @@
  	path_release(&nd);
  out:
  	return error;
-@@ -259,8 +264,9 @@ asmlinkage long sys_utime(char * filenam
- 	struct nameidata nd;
+@@ -215,7 +228,7 @@ static inline long do_sys_ftruncate(unsi
+ 
+ 	error = locks_verify_truncate(inode, file, length);
+ 	if (!error)
+-		error = do_truncate(dentry, length);
++		error = do_truncate(dentry, length, 0);
+ out_putf:
+ 	fput(file);
+ out:
+@@ -260,11 +273,13 @@ asmlinkage long sys_utime(char * filenam
  	struct inode * inode;
  	struct iattr newattrs;
-+	struct lookup_intent it = { .it_op = IT_SETATTR };
  
 -	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
++	error = user_path_walk_it(filename, &nd, NULL);
  	if (error)
  		goto out;
  	inode = nd.dentry->d_inode;
-@@ -286,6 +292,7 @@ asmlinkage long sys_utime(char * filenam
+ 
++	/* this is safe without a Lustre lock because it only depends
++	   on the super block */
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+@@ -279,11 +294,29 @@ asmlinkage long sys_utime(char * filenam
+ 			goto dput_and_out;
+ 
+ 		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
+-	} else {
++	}
++
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
++	error = -EROFS;
++	if (IS_RDONLY(inode))
++		goto dput_and_out;
++
++	error = -EPERM;
++	if (!times) {
+ 		if (current->fsuid != inode->i_uid &&
+ 		    (error = permission(inode,MAY_WRITE)) != 0)
+ 			goto dput_and_out;
  	}
++
  	error = notify_change(nd.dentry, &newattrs);
  dput_and_out:
-+	intent_release(nd.dentry, &it);
  	path_release(&nd);
- out:
- 	return error;
-@@ -303,8 +310,9 @@ asmlinkage long sys_utimes(char * filena
- 	struct nameidata nd;
+@@ -304,12 +337,14 @@ asmlinkage long sys_utimes(char * filena
  	struct inode * inode;
  	struct iattr newattrs;
-+	struct lookup_intent it = { .it_op = IT_SETATTR };
  
 -	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
++	error = user_path_walk_it(filename, &nd, NULL);
  
  	if (error)
  		goto out;
-@@ -331,6 +339,7 @@ asmlinkage long sys_utimes(char * filena
- 	}
- 	error = notify_change(nd.dentry, &newattrs);
- dput_and_out:
-+	intent_release(nd.dentry, &it);
- 	path_release(&nd);
- out:
- 	return error;
-@@ -347,6 +356,7 @@ asmlinkage long sys_access(const char * 
+ 	inode = nd.dentry->d_inode;
+ 
++	/* this is safe without a Lustre lock because it only depends
++	   on the super block */
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+@@ -324,7 +359,20 @@ asmlinkage long sys_utimes(char * filena
+ 		newattrs.ia_atime = times[0].tv_sec;
+ 		newattrs.ia_mtime = times[1].tv_sec;
+ 		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
+-	} else {
++	}
++
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
++	error = -EPERM;
++	if (!utimes) {
+ 		if (current->fsuid != inode->i_uid &&
+ 		    (error = permission(inode,MAY_WRITE)) != 0)
+ 			goto dput_and_out;
+@@ -347,6 +395,7 @@ asmlinkage long sys_access(const char * 
  	int old_fsuid, old_fsgid;
  	kernel_cap_t old_cap;
  	int res;
@@ -840,7 +1042,7 @@
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
-@@ -364,13 +374,14 @@ asmlinkage long sys_access(const char * 
+@@ -364,13 +413,14 @@ asmlinkage long sys_access(const char * 
  	else
  		current->cap_effective = current->cap_permitted;
  
@@ -856,7 +1058,7 @@
  		path_release(&nd);
  	}
  
-@@ -385,8 +396,11 @@ asmlinkage long sys_chdir(const char * f
+@@ -385,8 +435,11 @@ asmlinkage long sys_chdir(const char * f
  {
  	int error;
  	struct nameidata nd;
@@ -869,7 +1071,7 @@
  	if (error)
  		goto out;
  
-@@ -397,6 +411,7 @@ asmlinkage long sys_chdir(const char * f
+@@ -397,6 +450,7 @@ asmlinkage long sys_chdir(const char * f
  	set_fs_pwd(current->fs, nd.mnt, nd.dentry);
  
  dput_and_out:
@@ -877,7 +1079,7 @@
  	path_release(&nd);
  out:
  	return error;
-@@ -436,9 +451,10 @@ asmlinkage long sys_chroot(const char * 
+@@ -436,9 +490,10 @@ asmlinkage long sys_chroot(const char * 
  {
  	int error;
  	struct nameidata nd;
@@ -890,7 +1092,7 @@
  	if (error)
  		goto out;
  
-@@ -454,6 +470,7 @@ asmlinkage long sys_chroot(const char * 
+@@ -454,6 +509,7 @@ asmlinkage long sys_chroot(const char * 
  	set_fs_altroot();
  	error = 0;
  dput_and_out:
@@ -898,54 +1100,47 @@
  	path_release(&nd);
  out:
  	return error;
-@@ -498,8 +515,9 @@ asmlinkage long sys_chmod(const char * f
- 	struct inode * inode;
- 	int error;
- 	struct iattr newattrs;
-+	struct lookup_intent it = { .it_op = IT_SETATTR };
+@@ -508,6 +564,18 @@ asmlinkage long sys_chmod(const char * f
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
  
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
- 	if (error)
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_mode = mode;
++		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -538,6 +606,20 @@ static int chown_common(struct dentry * 
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
  		goto out;
- 	inode = nd.dentry->d_inode;
-@@ -519,6 +537,7 @@ asmlinkage long sys_chmod(const char * f
- 	error = notify_change(nd.dentry, &newattrs);
- 
- dput_and_out:
-+	intent_release(nd.dentry, &it);
- 	path_release(&nd);
- out:
- 	return error;
-@@ -588,10 +607,12 @@ asmlinkage long sys_chown(const char * f
- {
- 	struct nameidata nd;
- 	int error;
-+	struct lookup_intent it = { .it_op = IT_SETATTR };
- 
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
- 	if (!error) {
- 		error = chown_common(nd.dentry, user, group);
-+		intent_release(nd.dentry, &it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -601,10 +622,12 @@ asmlinkage long sys_lchown(const char * 
- {
- 	struct nameidata nd;
- 	int error;
-+	struct lookup_intent it = { .it_op = IT_SETATTR };
- 
--	error = user_path_walk_link(filename, &nd);
-+	error = user_path_walk_link_it(filename, &nd, &it);
- 	if (!error) {
- 		error = chown_common(nd.dentry, user, group);
-+		intent_release(nd.dentry, &it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -628,7 +651,8 @@ extern ssize_t do_readahead(struct file 
++
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = dentry->d_inode->i_op;
++
++		newattrs.ia_uid = user;
++		newattrs.ia_gid = group;
++		newattrs.ia_valid = ATTR_UID | ATTR_GID;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			return error;
++	}
++
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto out;
+@@ -628,7 +710,8 @@ extern ssize_t do_readahead(struct file 
  /* for files over a certains size it doesn't pay to do readahead on open */
  #define READAHEAD_CUTOFF 48000
  
@@ -955,7 +1150,16 @@
  {
  	struct file * f;
  	struct inode *inode;
-@@ -693,6 +717,7 @@ struct file *dentry_open(struct dentry *
+@@ -649,7 +732,7 @@ struct file *dentry_open(struct dentry *
+ 		error = locks_verify_locked(inode);
+ 		if (!error) {
+ 			DQUOT_INIT(inode);
+-			error = do_truncate(dentry, 0);
++			error = do_truncate(dentry, 0, 1);
+ 		}
+ 		if (error || !(f->f_mode & FMODE_WRITE))
+ 			put_write_access(inode);
+@@ -693,6 +776,7 @@ struct file *dentry_open(struct dentry *
  		do_readahead(f, 0, (48 * 1024) >> PAGE_SHIFT);
  	
  
@@ -963,7 +1167,7 @@
  	return f;
  
  cleanup_all:
-@@ -707,11 +732,17 @@ cleanup_all:
+@@ -707,11 +791,17 @@ cleanup_all:
  cleanup_file:
  	put_filp(f);
  cleanup_dentry:
@@ -981,17 +1185,9 @@
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
---- linux-2.4.18-49chaos-lustre9/fs/stat.c~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/fs/stat.c	Wed Jan 29 12:43:32 2003
-@@ -13,6 +13,7 @@
- 
- #include <asm/uaccess.h>
- 
-+extern void intent_release(struct dentry *de, struct lookup_intent *it);
- /*
-  * Revalidate the inode. This is required for proper NFS attribute caching.
-  */
-@@ -104,10 +105,12 @@ int vfs_stat(char *name, struct kstat *s
+--- linux-2.4.18-18.8.0-l12/fs/stat.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/fs/stat.c	Wed Feb 26 16:54:17 2003
+@@ -104,10 +104,12 @@ int vfs_stat(char *name, struct kstat *s
  {
  	struct nameidata nd;
  	int error;
@@ -1005,7 +1201,7 @@
  		path_release(&nd);
  	}
  	return error;
-@@ -117,10 +120,12 @@ int vfs_lstat(char *name, struct kstat *
+@@ -117,10 +119,12 @@ int vfs_lstat(char *name, struct kstat *
  {
  	struct nameidata nd;
  	int error;
@@ -1019,9 +1215,71 @@
  		path_release(&nd);
  	}
  	return error;
---- linux-2.4.18-49chaos-lustre9/include/linux/dcache.h~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/include/linux/dcache.h	Wed Jan 29 12:43:32 2003
-@@ -6,6 +6,27 @@
+--- linux-2.4.18-18.8.0-l12/fs/exec.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/fs/exec.c	Wed Feb 26 16:54:17 2003
+@@ -103,13 +103,18 @@ static inline void put_binfmt(struct lin
+  *
+  * Also note that we take the address to load from from the file itself.
+  */
++extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
++			    int flags, struct lookup_intent *it);
++int path_lookup_it(const char *path, unsigned flags, struct nameidata *nd,
++		   struct lookup_intent *it);
+ asmlinkage long sys_uselib(const char * library)
+ {
+ 	struct file * file;
+ 	struct nameidata nd;
+ 	int error;
++	struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = O_RDONLY };
+ 
+-	error = user_path_walk(library, &nd);
++	error = user_path_walk_it(library, &nd, &it);
+ 	if (error)
+ 		goto out;
+ 
+@@ -121,7 +126,8 @@ asmlinkage long sys_uselib(const char * 
+ 	if (error)
+ 		goto exit;
+ 
+-	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
++	intent_release(nd.dentry, &it);
+ 	error = PTR_ERR(file);
+ 	if (IS_ERR(file))
+ 		goto out;
+@@ -350,8 +356,9 @@ struct file *open_exec(const char *name)
+ 	struct inode *inode;
+ 	struct file *file;
+ 	int err = 0;
++	struct lookup_intent it = { .it_op = IT_OPEN, .it_flags = O_RDONLY };
+ 
+-	err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
++	err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
+ 	file = ERR_PTR(err);
+ 	if (!err) {
+ 		inode = nd.dentry->d_inode;
+@@ -363,7 +370,8 @@ struct file *open_exec(const char *name)
+ 				err = -EACCES;
+ 			file = ERR_PTR(err);
+ 			if (!err) {
+-				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++				file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
++				intent_release(nd.dentry, &it);
+ 				if (!IS_ERR(file)) {
+ 					err = deny_write_access(file);
+ 					if (err) {
+@@ -976,7 +984,7 @@ int do_coredump(long signr, struct pt_re
+ 		goto close_fail;
+ 	if (!file->f_op->write)
+ 		goto close_fail;
+-	if (do_truncate(file->f_dentry, 0) != 0)
++	if (do_truncate(file->f_dentry, 0, 0) != 0)
+ 		goto close_fail;
+ 
+ 	retval = binfmt->core_dump(signr, regs, file);
+--- linux-2.4.18-18.8.0-l12/include/linux/dcache.h~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/include/linux/dcache.h	Wed Feb 26 17:01:30 2003
+@@ -6,6 +6,25 @@
  #include <asm/atomic.h>
  #include <linux/mount.h>
  
@@ -1029,10 +1287,8 @@
 +#define IT_CREAT    (1<<1)
 +#define IT_READDIR  (1<<2)
 +#define IT_GETATTR  (1<<3)
-+#define IT_SETATTR  (1<<4)
-+#define IT_TRUNC    (1<<5)
-+#define IT_READLINK (1<<6)
-+#define IT_LOOKUP   (1<<7)
++#define IT_LOOKUP   (1<<4)
++#define IT_UNLINK   (1<<5)
 +
 +struct lookup_intent {
 +	int it_op;
@@ -1049,7 +1305,7 @@
  /*
   * linux/include/linux/dcache.h
   *
-@@ -78,6 +99,7 @@ struct dentry {
+@@ -78,6 +97,7 @@ struct dentry {
  	unsigned long d_time;		/* used by d_revalidate */
  	struct dentry_operations  *d_op;
  	struct super_block * d_sb;	/* The root of the dentry tree */
@@ -1057,7 +1313,7 @@
  	unsigned long d_vfs_flags;
  	void * d_fsdata;		/* fs-specific data */
  	void * d_extra_attributes;	/* TUX-specific data */
-@@ -91,6 +113,8 @@ struct dentry_operations {
+@@ -91,8 +111,15 @@ struct dentry_operations {
  	int (*d_delete)(struct dentry *);
  	void (*d_release)(struct dentry *);
  	void (*d_iput)(struct dentry *, struct inode *);
@@ -1065,8 +1321,15 @@
 +	void (*d_intent_release)(struct dentry *, struct lookup_intent *);
  };
  
++/* defined in fs/namei.c */
++extern void intent_release(struct dentry *de, struct lookup_intent *it);
++/* defined in fs/dcache.c */
++extern void __d_rehash(struct dentry * entry, int lock);
++
  /* the dentry parameter passed to d_hash and d_compare is the parent
-@@ -124,6 +148,7 @@ d_iput:		no		no		yes
+  * directory of the entries to be compared. It is used in case these
+  * functions need any directory specific information for determining
+@@ -124,6 +151,7 @@ d_iput:		no		no		yes
  					 * s_nfsd_free_path semaphore will be down
  					 */
  #define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
@@ -1074,9 +1337,18 @@
  
  extern spinlock_t dcache_lock;
  
---- linux-2.4.18-49chaos-lustre9/include/linux/fs.h~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/include/linux/fs.h	Wed Jan 29 12:43:32 2003
-@@ -576,6 +576,7 @@ struct file {
+--- linux-2.4.18-18.8.0-l12/include/linux/fs.h~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/include/linux/fs.h	Wed Feb 26 17:31:42 2003
+@@ -338,6 +338,8 @@ extern void set_bh_page(struct buffer_he
+ #define ATTR_MTIME_SET	256
+ #define ATTR_FORCE	512	/* Not a change, but a change it */
+ #define ATTR_ATTR_FLAG	1024
++#define ATTR_RAW	2048	/* file system, not vfs will massage attrs */
++#define ATTR_FROM_OPEN	4096	/* called from open path, ie O_TRUNC */
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -576,6 +578,7 @@ struct file {
  
  	/* needed for tty driver, and maybe others */
  	void			*private_data;
@@ -1084,7 +1356,7 @@
  
  	/* preallocated helper kiobuf to speedup O_DIRECT */
  	struct kiobuf		*f_iobuf;
-@@ -836,7 +837,9 @@ extern int vfs_symlink(struct inode *, s
+@@ -836,7 +839,9 @@ extern int vfs_symlink(struct inode *, s
  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 *);
@@ -1095,7 +1367,7 @@
  
  /*
   * File types
-@@ -897,16 +900,28 @@ struct file_operations {
+@@ -897,20 +902,33 @@ struct file_operations {
  struct inode_operations {
  	int (*create) (struct inode *,struct dentry *,int);
  	struct dentry * (*lookup) (struct inode *,struct dentry *);
@@ -1124,7 +1396,21 @@
  	void (*truncate) (struct inode *);
  	int (*permission) (struct inode *, int);
  	int (*revalidate) (struct dentry *);
-@@ -1383,6 +1398,7 @@ typedef int (*read_actor_t)(read_descrip
+ 	int (*setattr) (struct dentry *, struct iattr *);
++	int (*setattr_raw) (struct inode *, struct iattr *);
+ 	int (*getattr) (struct dentry *, struct iattr *);
+ };
+ 
+@@ -1112,7 +1130,7 @@ static inline int get_lease(struct inode
+ 
+ asmlinkage long sys_open(const char *, int, int);
+ asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
+-extern int do_truncate(struct dentry *, loff_t start);
++extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+@@ -1381,6 +1399,7 @@ typedef int (*read_actor_t)(read_descrip
  extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
  
  extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
@@ -1132,7 +1418,7 @@
  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 *));
-@@ -1394,6 +1410,8 @@ extern struct dentry * lookup_one_len(co
+@@ -1392,6 +1411,8 @@ extern struct dentry * lookup_one_len(co
  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)
@@ -1141,7 +1427,7 @@
  
  extern void inode_init_once(struct inode *);
  extern void iput(struct inode *);
-@@ -1494,6 +1512,8 @@ extern struct file_operations generic_ro
+@@ -1492,6 +1513,8 @@ extern struct file_operations generic_ro
  
  extern int vfs_readlink(struct dentry *, char *, int, const char *);
  extern int vfs_follow_link(struct nameidata *, const char *);
@@ -1150,9 +1436,9 @@
  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-49chaos-lustre9/kernel/ksyms.c~vfs_intent-2.4.18-18	Wed Jan 29 12:43:32 2003
-+++ linux-2.4.18-49chaos-lustre9-root/kernel/ksyms.c	Wed Jan 29 12:43:32 2003
-@@ -294,6 +294,7 @@ EXPORT_SYMBOL(read_cache_page);
+--- linux-2.4.18-18.8.0-l12/kernel/ksyms.c~vfs_intent-2.4.18-18	Wed Feb 26 16:54:17 2003
++++ linux-2.4.18-18.8.0-l12-phil/kernel/ksyms.c	Wed Feb 26 16:54:17 2003
+@@ -293,6 +293,7 @@ EXPORT_SYMBOL(read_cache_page);
  EXPORT_SYMBOL(set_page_dirty);
  EXPORT_SYMBOL(vfs_readlink);
  EXPORT_SYMBOL(vfs_follow_link);
@@ -1160,5 +1446,3 @@
  EXPORT_SYMBOL(page_readlink);
  EXPORT_SYMBOL(page_follow_link);
  EXPORT_SYMBOL(page_symlink_inode_operations);
-
-_