smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

[fs/lustre-release.git] / lustre / kernel_patches / patches / fs-intent-2.6.3-mm4.patch

diff --git a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch b/lustre/kernel_patches/patches/fs-intent-2.6.3-mm4.patch
similarity index 77%
rename from lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
rename to lustre/kernel_patches/patches/fs-intent-2.6.3-mm4.patch
index 023159c..a5c8725 100644 (file)
--- a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/fs-intent-2.6.3-mm4.patch
@@ -2,11 +2,11 @@
 .new.........fs/nfs/dir.c
 .old..........pc/linux-2.6.3-nfs-intent-suse/fs/nfs/dir.c
 .new.........fs/nfs/dir.c
-Index: linux-2.6.4-51.0/fs/nfs/dir.c
+Index: linux-2.6.3-mm4/fs/nfs/dir.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/nfs/dir.c 2004-04-05 17:09:16.000000000 -0400
-+++ linux-2.6.4-51.0/fs/nfs/dir.c      2004-04-05 17:09:23.000000000 -0400
-@@ -782,7 +782,7 @@
+--- linux-2.6.3-mm4.orig/fs/nfs/dir.c  2004-03-08 17:05:35.000000000 +0800
++++ linux-2.6.3-mm4/fs/nfs/dir.c       2004-03-08 17:38:58.000000000 +0800
+@@ -773,7 +773,7 @@
        if (nd->flags & LOOKUP_DIRECTORY)
                return 0;
        /* Are we trying to write to a read only partition? */
@@ -15,7 +15,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
                return 0;
        return 1;
  }
-@@ -803,7 +803,7 @@
+@@ -794,7 +794,7 @@
        dentry->d_op = NFS_PROTO(dir)->dentry_ops;
  
        /* Let vfs_create() deal with O_EXCL */
@@ -24,7 +24,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
                goto no_entry;
  
        /* Open the file on the server */
-@@ -811,7 +811,7 @@
+@@ -802,7 +802,7 @@
        /* Revalidate parent directory attribute cache */
        nfs_revalidate_inode(NFS_SERVER(dir), dir);
  
@@ -33,7 +33,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
                nfs_begin_data_update(dir);
                inode = nfs4_atomic_open(dir, dentry, nd);
                nfs_end_data_update(dir);
-@@ -827,7 +827,7 @@
+@@ -818,7 +818,7 @@
                                break;
                        /* This turned out not to be a regular file */
                        case -ELOOP:
@@ -42,7 +42,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
                                        goto no_open;
                        /* case -EISDIR: */
                        /* case -EINVAL: */
-@@ -861,7 +861,7 @@
+@@ -852,7 +852,7 @@
        dir = parent->d_inode;
        if (!is_atomic_open(dir, nd))
                goto no_open;
@@ -51,11 +51,11 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
        if (openflags & O_CREAT) {
                /* If this is a negative dentry, just drop it */
                if (!inode)
-Index: linux-2.6.4-51.0/fs/nfs/nfs4proc.c
+Index: linux-2.6.3-mm4/fs/nfs/nfs4proc.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/nfs/nfs4proc.c    2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/nfs/nfs4proc.c 2004-04-05 17:09:23.000000000 -0400
-@@ -792,17 +792,17 @@
+--- linux-2.6.3-mm4.orig/fs/nfs/nfs4proc.c     2004-03-08 17:02:24.000000000 +0800
++++ linux-2.6.3-mm4/fs/nfs/nfs4proc.c  2004-03-08 17:37:59.000000000 +0800
+@@ -778,17 +778,17 @@
        struct nfs4_state *state;
  
        if (nd->flags & LOOKUP_CREATE) {
@@ -76,27 +76,23 @@ Index: linux-2.6.4-51.0/fs/nfs/nfs4proc.c
        put_rpccred(cred);
        if (IS_ERR(state))
                return (struct inode *)state;
-Index: linux-2.6.4-51.0/fs/cifs/dir.c
+Index: linux-2.6.3-mm4/fs/cifs/dir.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/cifs/dir.c        2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/cifs/dir.c     2004-04-05 17:13:47.000000000 -0400
-@@ -146,22 +146,22 @@
+--- linux-2.6.3-mm4.orig/fs/cifs/dir.c 2004-02-18 11:58:34.000000000 +0800
++++ linux-2.6.3-mm4/fs/cifs/dir.c      2004-03-08 17:37:59.000000000 +0800
+@@ -146,18 +146,18 @@
        if(nd) { 
                cFYI(1,("In create for inode %p dentry->inode %p nd flags = 0x%x for %s",inode, direntry->d_inode, nd->flags,full_path));
  
 -              if ((nd->intent.open.flags & O_ACCMODE) == O_RDONLY)
 +              if ((nd->intent.it_flags & O_ACCMODE) == O_RDONLY)
-                       desiredAccess = GENERIC_READ;
+                       desiredAccess = GENERIC_READ;
 -              else if ((nd->intent.open.flags & O_ACCMODE) == O_WRONLY)
 +              else if ((nd->intent.it_flags & O_ACCMODE) == O_WRONLY)
                        desiredAccess = GENERIC_WRITE;
--              else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR) {
-+              else if ((nd->intent.it_flags & O_ACCMODE) == O_RDWR) {
-                       /* GENERIC_ALL is too much permission to request */
-                       /* can cause unnecessary access denied on create */
-                       /* desiredAccess = GENERIC_ALL; */
-                       desiredAccess = GENERIC_READ | GENERIC_WRITE;
-               }
+-              else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR)
++              else if ((nd->intent.it_flags & O_ACCMODE) == O_RDWR)
+                       desiredAccess = GENERIC_ALL;
  
 -              if((nd->intent.open.flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
 +              if((nd->intent.it_flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
@@ -109,7 +105,7 @@ Index: linux-2.6.4-51.0/fs/cifs/dir.c
                        disposition = FILE_OPEN_IF;
                else {
                        cFYI(1,("Create flag not set in create function"));
-@@ -319,7 +319,7 @@
+@@ -314,7 +314,7 @@
              parent_dir_inode, direntry->d_name.name, direntry));
  
        if(nd) {  /* BB removeme */