land b_smallfix 20040407_1414:

[fs/lustre-release.git] / lustre / kernel_patches / patches / vfs_intent-2.6-suse.patch

diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch b/lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
similarity index 93%
rename from lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch
rename to lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
index aaae350..9b7c70a 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
@@ -1,17 +1,3 @@
- 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(-)
-
-.old..........pc/vfs_intent-2.6.3-suse/fs/exec.c
-.new.........fs/exec.c
 Index: linux-2.6.3-20/fs/exec.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/exec.c      2004-03-05 02:07:04.000000000 -0800
@@ -59,8 +45,6 @@ Index: linux-2.6.3-20/fs/exec.c
                                if (!IS_ERR(file)) {
                                        err = deny_write_access(file);
                                        if (err) {
-.old..........pc/vfs_intent-2.6.3-suse/fs/namei.c
-.new.........fs/namei.c
 Index: linux-2.6.3-20/fs/namei.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/namei.c     2004-03-05 02:07:04.000000000 -0800
@@ -281,8 +265,6 @@ Index: linux-2.6.3-20/fs/namei.c
        res = link_path_walk(link, nd);
  out:
        if (current->link_count || res || nd->last_type!=LAST_NORM)
-.old..........pc/vfs_intent-2.6.3-suse/fs/namespace.c
-.new.........fs/namespace.c
 Index: linux-2.6.3-20/fs/namespace.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/namespace.c 2004-03-05 02:07:04.000000000 -0800
@@ -295,8 +277,6 @@ Index: linux-2.6.3-20/fs/namespace.c
        /* Discard magic */
        if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
                flags &= ~MS_MGC_MSK;
-.old..........pc/vfs_intent-2.6.3-suse/fs/open.c
-.new.........fs/open.c
 Index: linux-2.6.3-20/fs/open.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/open.c      2004-03-05 02:07:04.000000000 -0800
@@ -442,8 +422,6 @@ Index: linux-2.6.3-20/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-.old..........pc/vfs_intent-2.6.3-suse/fs/stat.c
-.new.........fs/stat.c
 Index: linux-2.6.3-20/fs/stat.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/stat.c      2004-03-05 02:07:04.000000000 -0800
@@ -517,8 +495,6 @@ Index: linux-2.6.3-20/fs/stat.c
                fput(f);
        }
        return error;
-.old..........pc/vfs_intent-2.6.3-suse/fs/nfs/dir.c
-.new.........fs/nfs/dir.c
 Index: linux-2.6.3-20/fs/nfs/dir.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/nfs/dir.c   2004-03-05 02:07:03.000000000 -0800
@@ -541,8 +517,6 @@ Index: linux-2.6.3-20/fs/nfs/dir.c
  
        /*
         * The 0 argument passed into the create function should one day
-.old..........pc/vfs_intent-2.6.3-suse/fs/inode.c
-.new.........fs/inode.c
 Index: linux-2.6.3-20/fs/inode.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/inode.c     2004-03-05 02:07:04.000000000 -0800
@@ -555,8 +529,6 @@ Index: linux-2.6.3-20/fs/inode.c
  /**
   * clear_inode - clear an inode
   * @inode: inode to clear
-.old..........pc/vfs_intent-2.6.3-suse/fs/super.c
-.new.........fs/super.c
 Index: linux-2.6.3-20/fs/super.c
 ===================================================================
 --- linux-2.6.3-20.orig/fs/super.c     2004-03-05 02:07:04.000000000 -0800
@@ -570,8 +542,6 @@ Index: linux-2.6.3-20/fs/super.c
  struct vfsmount *kern_mount(struct file_system_type *type)
  {
        return do_kern_mount(type->name, 0, type->name, NULL);
-.old..........pc/vfs_intent-2.6.3-suse/include/linux/dcache.h
-.new.........include/linux/dcache.h
 Index: linux-2.6.3-20/include/linux/dcache.h
 ===================================================================
 --- linux-2.6.3-20.orig/include/linux/dcache.h 2004-03-05 02:07:17.000000000 -0800
@@ -593,8 +563,6 @@ Index: linux-2.6.3-20/include/linux/dcache.h
  struct dentry_stat_t {
        int nr_dentry;
        int nr_unused;
-.old..........pc/vfs_intent-2.6.3-suse/include/linux/fs.h
-.new.........include/linux/fs.h
 Index: linux-2.6.3-20/include/linux/fs.h
 ===================================================================
 --- linux-2.6.3-20.orig/include/linux/fs.h     2004-03-05 02:07:17.000000000 -0800
@@ -650,8 +618,6 @@ Index: linux-2.6.3-20/include/linux/fs.h
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
  
-.old..........pc/vfs_intent-2.6.3-suse/include/linux/namei.h
-.new.........include/linux/namei.h
 Index: linux-2.6.3-20/include/linux/namei.h
 ===================================================================
 --- linux-2.6.3-20.orig/include/linux/namei.h  2004-03-05 02:07:18.000000000 -0800
@@ -751,8 +717,6 @@ Index: linux-2.6.3-20/include/linux/namei.h
  extern int follow_down(struct vfsmount **, struct dentry **);
  extern int follow_up(struct vfsmount **, struct dentry **);
  
-.old..........pc/vfs_intent-2.6.3-suse/kernel/exit.c
-.new.........kernel/exit.c
 Index: linux-2.6.3-20/kernel/exit.c
 ===================================================================
 --- linux-2.6.3-20.orig/kernel/exit.c  2004-03-05 02:07:17.000000000 -0800