X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fnfs-cifs-intent-2.6-suse.patch;h=0adb06c08a8c27cfc3cdaa1d3a53bfe51b11cb62;hb=980d932e20c48fddca61029aca8c4df8891f828e;hp=023159cd600e99926af96f07ba755a86361c2ee6;hpb=2dc9c16e770415d56839e1996015fec5fab93f29;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch b/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
index 023159c..0adb06c 100644
--- a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
@@ -1,11 +1,16 @@
-.old..........pc/linux-2.6.3-nfs-intent-suse/fs/nfs/dir.c
-.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.5-7.108/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
+--- linux-2.6.5-7.108.orig/fs/nfs/dir.c	2004-09-15 19:26:43.012732408 +0300
++++ linux-2.6.5-7.108/fs/nfs/dir.c	2004-09-15 20:03:32.882781096 +0300
+@@ -709,7 +709,7 @@
+ 		return 0;
+ 	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
+ 		return 0;
+-	return (nd->intent.open.flags & O_EXCL) != 0;
++	return (nd->intent.it_flags & O_EXCL) != 0;
+ }
+ 
+ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
 @@ -782,7 +782,7 @@
  	if (nd->flags & LOOKUP_DIRECTORY)
  		return 0;
@@ -51,10 +56,19 @@ 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
+@@ -1026,7 +1026,7 @@
+ 	attr.ia_valid = ATTR_MODE;
+ 
+ 	if (nd && (nd->flags & LOOKUP_CREATE))
+-		open_flags = nd->intent.open.flags;
++		open_flags = nd->intent.it_flags;
+ 
+ 	/*
+ 	 * The 0 argument passed into the create function should one day
+Index: linux-2.6.5-7.108/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
+--- linux-2.6.5-7.108.orig/fs/nfs/nfs4proc.c	2004-04-04 06:37:39.000000000 +0300
++++ linux-2.6.5-7.108/fs/nfs/nfs4proc.c	2004-09-15 20:03:32.885780640 +0300
 @@ -792,17 +792,17 @@
  	struct nfs4_state *state;
  
@@ -76,22 +90,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.5-7.108/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 @@
- 	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));
+--- linux-2.6.5-7.108.orig/fs/cifs/dir.c	2004-09-04 13:28:22.000000000 +0300
++++ linux-2.6.5-7.108/fs/cifs/dir.c	2004-09-15 20:03:40.065689128 +0300
+@@ -173,23 +173,23 @@
+ 	}
  
+ 	if(nd) {
 -		if ((nd->intent.open.flags & O_ACCMODE) == O_RDONLY)
 +		if ((nd->intent.it_flags & O_ACCMODE) == O_RDONLY)
  			desiredAccess = GENERIC_READ;
--		else if ((nd->intent.open.flags & O_ACCMODE) == O_WRONLY)
-+		else if ((nd->intent.it_flags & O_ACCMODE) == O_WRONLY)
+-		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) {
+ 			write_only = TRUE;
+-		} 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; */
@@ -109,7 +124,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 @@
+@@ -359,7 +359,7 @@
  	      parent_dir_inode, direntry->d_name.name, direntry));
  
  	if(nd) {  /* BB removeme */