X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fvfs_intent-2.6.3.patch;fp=lustre%2Fkernel_patches%2Fpatches%2Fvfs_intent-2.6-suse.patch;h=a801f967929cacb3198ac44d21fb2fe0b8a76e37;hb=090c677210ee2946d99c71412e4ff762bb300f4f;hp=c678b4ee6a787259a04f05f6bd09e04442f61fee;hpb=c843241715b13024a656fad4e465be20e7fc5c79;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch b/lustre/kernel_patches/patches/vfs_intent-2.6.3.patch
similarity index 81%
rename from lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
rename to lustre/kernel_patches/patches/vfs_intent-2.6.3.patch
index c678b4e..a801f96 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6.3.patch
@@ -1,8 +1,20 @@
-Index: linux-2.6.4-51.0/fs/exec.c
+ fs/exec.c              |   18 +++++++---
+ fs/namei.c             |   86 +++++++++++++++++++++++++++++++++++++++++++++----
+ fs/namespace.c         |    2 +
+ fs/nfs/dir.c           |    4 +-
+ fs/open.c              |   62 +++++++++++++++++++++++------------
+ fs/stat.c              |   24 ++++++++++---
+ include/linux/dcache.h |    3 +
+ include/linux/fs.h     |    8 ++++
+ include/linux/namei.h  |   56 ++++++++++++++++++++++++++-----
+ kernel/ksyms.c         |    8 ++++
+ 10 files changed, 222 insertions(+), 49 deletions(-)
+
+Index: uml-2.6.3/fs/exec.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/exec.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/exec.c	2004-04-05 17:36:42.000000000 -0400
-@@ -122,8 +122,11 @@
+--- uml-2.6.3.orig/fs/exec.c	2004-02-20 15:00:48.000000000 +0800
++++ uml-2.6.3/fs/exec.c	2004-02-21 00:15:14.154506296 +0800
+@@ -120,8 +120,11 @@
  	struct file * file;
  	struct nameidata nd;
  	int error;
@@ -15,7 +27,7 @@ Index: linux-2.6.4-51.0/fs/exec.c
  	error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
  	if (error)
  		goto out;
-@@ -136,7 +139,7 @@
+@@ -134,7 +137,7 @@
  	if (error)
  		goto exit;
  
@@ -24,7 +36,7 @@ Index: linux-2.6.4-51.0/fs/exec.c
  	error = PTR_ERR(file);
  	if (IS_ERR(file))
  		goto out;
-@@ -485,8 +488,9 @@
+@@ -474,8 +477,9 @@
  	int err;
  	struct file *file;
  
@@ -36,7 +48,7 @@ Index: linux-2.6.4-51.0/fs/exec.c
  	file = ERR_PTR(err);
  
  	if (!err) {
-@@ -499,7 +503,7 @@
+@@ -488,7 +492,7 @@
  				err = -EACCES;
  			file = ERR_PTR(err);
  			if (!err) {
@@ -45,11 +57,11 @@ Index: linux-2.6.4-51.0/fs/exec.c
  				if (!IS_ERR(file)) {
  					err = deny_write_access(file);
  					if (err) {
-Index: linux-2.6.4-51.0/fs/namei.c
+Index: uml-2.6.3/fs/namei.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/namei.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/namei.c	2004-04-05 17:36:42.000000000 -0400
-@@ -269,8 +269,19 @@
+--- uml-2.6.3.orig/fs/namei.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/namei.c	2004-02-20 23:59:00.678497144 +0800
+@@ -268,8 +268,19 @@
  	return 0;
  }
  
@@ -69,7 +81,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	dput(nd->dentry);
  	mntput(nd->mnt);
  }
-@@ -347,7 +358,10 @@
+@@ -346,7 +357,10 @@
  {
  	struct dentry * result;
  	struct inode *dir = parent->d_inode;
@@ -80,7 +92,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	down(&dir->i_sem);
  	/*
  	 * First re-do the cached lookup just in case it was created
-@@ -386,7 +400,10 @@
+@@ -385,7 +399,10 @@
  	if (result->d_op && result->d_op->d_revalidate) {
  		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
  			dput(result);
@@ -92,7 +104,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  		}
  	}
  	return result;
-@@ -563,6 +580,33 @@
+@@ -562,6 +579,31 @@
  	return PTR_ERR(dentry);
  }
  
@@ -109,8 +121,6 @@ Index: linux-2.6.4-51.0/fs/namei.c
 +		if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
 +			return err;
 +		new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
-+		if (IS_ERR(new))
-+			return PTR_ERR(new);
 +		d_invalidate(dentry);
 +		dput(dentry);
 +		nd->dentry = dentry = new;
@@ -126,7 +136,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  /*
   * Name resolution.
   *
-@@ -663,7 +705,9 @@
+@@ -662,7 +704,9 @@
  
  		if (inode->i_op->follow_link) {
  			mntget(next.mnt);
@@ -136,27 +146,19 @@ Index: linux-2.6.4-51.0/fs/namei.c
  			dput(next.dentry);
  			mntput(next.mnt);
  			if (err)
-@@ -702,14 +746,29 @@
+@@ -701,6 +745,11 @@
  				inode = nd->dentry->d_inode;
  				/* fallthrough */
  			case 1:
 + 				nd->flags |= LOOKUP_LAST;
 + 				err = revalidate_special(nd);
 + 				nd->flags &= ~LOOKUP_LAST;
-+				if (err)
++ 				if (err)
 + 					break;
  				goto return_reval;
  		}
-+		
-+		if (err) {
-+			if (!nd->dentry->d_inode)
-+				err = -ENOENT;
-+			
-+			goto return_err;			
-+		}
-+		
  		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
- 			err = nd->dentry->d_op->d_hash(nd->dentry, &this);
+@@ -708,7 +757,9 @@
  			if (err < 0)
  				break;
  		}
@@ -166,7 +168,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  		if (err)
  			break;
  		follow_mount(&next.mnt, &next.dentry);
-@@ -935,7 +994,7 @@
+@@ -934,7 +985,7 @@
  }
  
  /* SMP-safe */
@@ -175,7 +177,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  {
  	unsigned long hash;
  	struct qstr this;
-@@ -955,11 +1014,16 @@
+@@ -954,11 +1005,16 @@
  	}
  	this.hash = end_name_hash(hash);
  
@@ -193,16 +195,21 @@ Index: linux-2.6.4-51.0/fs/namei.c
  /*
   *	namei()
   *
-@@ -971,7 +1035,7 @@
+@@ -970,11 +1026,12 @@
   * that namei follows links, while lnamei does not.
   * SMP-safe
   */
--int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
-+int fastcall __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
+-int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++int __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
  {
  	char *tmp = getname(name);
  	int err = PTR_ERR(tmp);
-@@ -983,6 +1047,12 @@
+ 
++
+ 	if (!IS_ERR(tmp)) {
+ 		err = path_lookup(tmp, flags, nd);
+ 		putname(tmp);
+@@ -982,6 +1039,12 @@
  	return err;
  }
  
@@ -215,7 +222,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -1255,8 +1325,8 @@
+@@ -1254,8 +1317,8 @@
  		acc_mode |= MAY_APPEND;
  
  	/* Fill in the open() intent data */
@@ -226,7 +233,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  
  	/*
  	 * The simplest case - just a plain lookup.
-@@ -1271,6 +1341,7 @@
+@@ -1270,6 +1333,7 @@
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -234,7 +241,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
  	if (error)
  		return error;
-@@ -1287,7 +1358,9 @@
+@@ -1286,7 +1350,9 @@
  	dir = nd->dentry;
  	nd->flags &= ~LOOKUP_PARENT;
  	down(&dir->d_inode->i_sem);
@@ -244,7 +251,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1392,7 +1465,9 @@
+@@ -1391,7 +1457,9 @@
  	}
  	dir = nd->dentry;
  	down(&dir->d_inode->i_sem);
@@ -254,7 +261,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	putname(nd->last.name);
  	goto do_last;
  }
-@@ -2154,7 +2229,9 @@
+@@ -2153,7 +2221,9 @@
  __vfs_follow_link(struct nameidata *nd, const char *link)
  {
  	int res = 0;
@@ -264,7 +271,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	if (IS_ERR(link))
  		goto fail;
  
-@@ -2164,6 +2241,10 @@
+@@ -2163,6 +2233,10 @@
  			/* weird __emul_prefix() stuff did it */
  			goto out;
  	}
@@ -275,19 +282,11 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	res = link_path_walk(link, nd);
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
-Index: linux-2.6.4-51.0/fs/namespace.c
+Index: uml-2.6.3/fs/namespace.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/namespace.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/namespace.c	2004-04-07 13:28:23.000000000 -0400
-@@ -107,6 +107,7 @@
- 
- static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd)
- {
-+	memset(old_nd, 0, sizeof(*old_nd));
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
- 	mnt->mnt_parent = mnt;
-@@ -748,6 +749,7 @@
+--- uml-2.6.3.orig/fs/namespace.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/namespace.c	2004-02-20 23:59:00.745486960 +0800
+@@ -744,6 +744,7 @@
  	int retval = 0;
  	int mnt_flags = 0;
  
@@ -295,11 +294,11 @@ Index: linux-2.6.4-51.0/fs/namespace.c
  	/* Discard magic */
  	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
  		flags &= ~MS_MGC_MSK;
-Index: linux-2.6.4-51.0/fs/open.c
+Index: uml-2.6.3/fs/open.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/open.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/open.c	2004-04-05 17:36:42.000000000 -0400
-@@ -211,7 +211,7 @@
+--- uml-2.6.3.orig/fs/open.c	2004-02-20 15:00:48.000000000 +0800
++++ uml-2.6.3/fs/open.c	2004-02-20 23:59:00.812476776 +0800
+@@ -202,7 +202,7 @@
  	struct nameidata nd;
  	struct inode * inode;
  	int error;
@@ -308,7 +307,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	error = -EINVAL;
  	if (length < 0)	/* sorry, but loff_t says... */
  		goto out;
-@@ -470,6 +470,7 @@
+@@ -461,6 +461,7 @@
  	int old_fsuid, old_fsgid;
  	kernel_cap_t old_cap;
  	int res;
@@ -316,7 +315,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
-@@ -501,6 +502,7 @@
+@@ -492,6 +493,7 @@
  		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
  		   && !special_file(nd.dentry->d_inode->i_mode))
  			res = -EROFS;
@@ -324,7 +323,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  		path_release(&nd);
  	}
  
-@@ -515,6 +517,7 @@
+@@ -506,6 +508,7 @@
  {
  	struct nameidata nd;
  	int error;
@@ -332,7 +331,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  
  	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
  	if (error)
-@@ -566,6 +569,7 @@
+@@ -557,6 +560,7 @@
  {
  	struct nameidata nd;
  	int error;
@@ -340,7 +339,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  
  	error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
  	if (error)
-@@ -638,7 +642,7 @@
+@@ -629,7 +633,7 @@
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
@@ -349,7 +348,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	error = -EPERM;
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto dput_and_out;
-@@ -746,27 +750,8 @@
+@@ -737,27 +741,8 @@
   * for the internal routines (ie open_namei()/follow_link() etc). 00 is
   * used by symlinks.
   */
@@ -379,7 +378,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  {
  	struct file * f;
  	struct inode *inode;
-@@ -778,6 +763,7 @@
+@@ -769,6 +754,7 @@
  		goto cleanup_dentry;
  	f->f_flags = flags;
  	f->f_mode = (flags+1) & O_ACCMODE;
@@ -387,7 +386,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	inode = dentry->d_inode;
  	if (f->f_mode & FMODE_WRITE) {
  		error = get_write_access(inode);
-@@ -797,6 +783,7 @@
+@@ -788,6 +774,7 @@
  		error = f->f_op->open(inode,f);
  		if (error)
  			goto cleanup_all;
@@ -395,7 +394,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	}
  	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
  
-@@ -821,6 +808,7 @@
+@@ -812,6 +799,7 @@
  cleanup_file:
  	put_filp(f);
  cleanup_dentry:
@@ -403,7 +402,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	dput(dentry);
  	mntput(mnt);
  	return ERR_PTR(error);
-@@ -828,6 +816,36 @@
+@@ -819,6 +807,36 @@
  
  EXPORT_SYMBOL(dentry_open);
  
@@ -440,10 +439,10 @@ Index: linux-2.6.4-51.0/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux-2.6.4-51.0/fs/stat.c
+Index: uml-2.6.3/fs/stat.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/stat.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/stat.c	2004-04-05 17:36:42.000000000 -0400
+--- uml-2.6.3.orig/fs/stat.c	2004-02-20 15:00:48.000000000 +0800
++++ uml-2.6.3/fs/stat.c	2004-02-20 23:59:00.878466744 +0800
 @@ -36,7 +36,7 @@
  
  EXPORT_SYMBOL(generic_fillattr);
@@ -513,11 +512,11 @@ Index: linux-2.6.4-51.0/fs/stat.c
  		fput(f);
  	}
  	return error;
-Index: linux-2.6.4-51.0/fs/nfs/dir.c
+Index: uml-2.6.3/fs/nfs/dir.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/nfs/dir.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/nfs/dir.c	2004-04-07 13:27:47.000000000 -0400
-@@ -709,7 +709,7 @@
+--- uml-2.6.3.orig/fs/nfs/dir.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/nfs/dir.c	2004-02-20 23:59:00.880466440 +0800
+@@ -672,7 +672,7 @@
  		return 0;
  	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
  		return 0;
@@ -526,7 +525,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  }
  
  static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
-@@ -1026,7 +1026,7 @@
+@@ -960,7 +960,7 @@
  	attr.ia_valid = ATTR_MODE;
  
  	if (nd && (nd->flags & LOOKUP_CREATE))
@@ -535,11 +534,11 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  
  	/*
  	 * The 0 argument passed into the create function should one day
-Index: linux-2.6.4-51.0/fs/inode.c
+Index: uml-2.6.3/fs/inode.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/inode.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/inode.c	2004-04-05 17:36:43.000000000 -0400
-@@ -221,6 +221,7 @@
+--- uml-2.6.3.orig/fs/inode.c	2004-01-09 15:00:12.000000000 +0800
++++ uml-2.6.3/fs/inode.c	2004-02-20 23:59:00.951455648 +0800
+@@ -223,6 +223,7 @@
  	inodes_stat.nr_unused--;
  }
  
@@ -547,11 +546,11 @@ Index: linux-2.6.4-51.0/fs/inode.c
  /**
   * clear_inode - clear an inode
   * @inode: inode to clear
-Index: linux-2.6.4-51.0/fs/super.c
+Index: uml-2.6.3/fs/super.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/super.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/super.c	2004-04-05 17:36:43.000000000 -0400
-@@ -787,6 +787,8 @@
+--- uml-2.6.3.orig/fs/super.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/super.c	2004-02-20 23:59:01.024444552 +0800
+@@ -757,6 +757,8 @@
  	return (struct vfsmount *)sb;
  }
  
@@ -560,10 +559,10 @@ Index: linux-2.6.4-51.0/fs/super.c
  struct vfsmount *kern_mount(struct file_system_type *type)
  {
  	return do_kern_mount(type->name, 0, type->name, NULL);
-Index: linux-2.6.4-51.0/include/linux/dcache.h
+Index: uml-2.6.3/include/linux/dcache.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/dcache.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/dcache.h	2004-04-05 17:36:43.000000000 -0400
+--- uml-2.6.3.orig/include/linux/dcache.h	2004-02-20 15:00:57.000000000 +0800
++++ uml-2.6.3/include/linux/dcache.h	2004-02-20 23:59:01.025444400 +0800
 @@ -4,6 +4,7 @@
  #ifdef __KERNEL__
  
@@ -581,11 +580,11 @@ Index: linux-2.6.4-51.0/include/linux/dcache.h
  struct dentry_stat_t {
  	int nr_dentry;
  	int nr_unused;
-Index: linux-2.6.4-51.0/include/linux/fs.h
+Index: uml-2.6.3/include/linux/fs.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/fs.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/fs.h	2004-04-05 17:36:43.000000000 -0400
-@@ -249,6 +249,8 @@
+--- uml-2.6.3.orig/include/linux/fs.h	2004-02-20 15:01:28.000000000 +0800
++++ uml-2.6.3/include/linux/fs.h	2004-02-20 23:59:01.100433000 +0800
+@@ -243,6 +243,8 @@
  #define ATTR_ATTR_FLAG	1024
  #define ATTR_KILL_SUID	2048
  #define ATTR_KILL_SGID	4096
@@ -594,7 +593,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -422,6 +424,7 @@
+@@ -408,6 +410,7 @@
  	struct block_device	*i_bdev;
  	struct cdev		*i_cdev;
  	int			i_cindex;
@@ -602,7 +601,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  
  	unsigned long		i_dnotify_mask; /* Directory notify events */
  	struct dnotify_struct	*i_dnotify; /* for directory notifications */
-@@ -554,6 +557,7 @@
+@@ -538,6 +541,7 @@
  	spinlock_t		f_ep_lock;
  #endif /* #ifdef CONFIG_EPOLL */
  	struct address_space	*f_mapping;
@@ -610,7 +609,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  };
  extern spinlock_t files_lock;
  #define file_list_lock() spin_lock(&files_lock);
-@@ -874,7 +878,9 @@
+@@ -843,7 +847,9 @@
  	void (*truncate) (struct inode *);
  	int (*permission) (struct inode *, int, struct nameidata *);
  	int (*setattr) (struct dentry *, struct iattr *);
@@ -620,7 +619,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
  	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
  	ssize_t (*listxattr) (struct dentry *, char *, size_t);
-@@ -1101,6 +1107,7 @@
+@@ -1056,6 +1062,7 @@
  extern int unregister_filesystem(struct file_system_type *);
  extern struct vfsmount *kern_mount(struct file_system_type *);
  extern int may_umount(struct vfsmount *);
@@ -628,18 +627,18 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  extern long do_mount(char *, char *, char *, unsigned long, void *);
  
  extern int vfs_statfs(struct super_block *, struct kstatfs *);
-@@ -1165,6 +1172,7 @@
- extern int do_truncate(struct dentry *, loff_t start);
+@@ -1123,6 +1130,7 @@
+ 
  extern struct file *filp_open(const char *, int, int);
  extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
  
-Index: linux-2.6.4-51.0/include/linux/namei.h
+Index: uml-2.6.3/include/linux/namei.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/namei.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/namei.h	2004-04-05 17:36:43.000000000 -0400
+--- uml-2.6.3.orig/include/linux/namei.h	2004-01-09 14:59:19.000000000 +0800
++++ uml-2.6.3/include/linux/namei.h	2004-02-20 23:59:01.174421752 +0800
 @@ -2,25 +2,55 @@
  #define _LINUX_NAMEI_H
  
@@ -735,11 +734,11 @@ Index: linux-2.6.4-51.0/include/linux/namei.h
  extern int follow_down(struct vfsmount **, struct dentry **);
  extern int follow_up(struct vfsmount **, struct dentry **);
  
-Index: linux-2.6.4-51.0/kernel/exit.c
+Index: uml-2.6.3/kernel/exit.c
 ===================================================================
---- linux-2.6.4-51.0.orig/kernel/exit.c	2004-04-05 12:42:08.000000000 -0400
-+++ linux-2.6.4-51.0/kernel/exit.c	2004-04-05 17:36:43.000000000 -0400
-@@ -259,6 +259,8 @@
+--- uml-2.6.3.orig/kernel/exit.c	2004-02-20 15:00:58.000000000 +0800
++++ uml-2.6.3/kernel/exit.c	2004-02-20 23:59:01.176421448 +0800
+@@ -255,6 +255,8 @@
  	write_unlock_irq(&tasklist_lock);
  }
  
@@ -748,7 +747,7 @@ Index: linux-2.6.4-51.0/kernel/exit.c
  void __set_special_pids(pid_t session, pid_t pgrp)
  {
  	struct task_struct *curr = current;
-@@ -428,6 +430,8 @@
+@@ -422,6 +424,8 @@
  	__exit_files(tsk);
  }