SOURCES (LINUX_2_6_22): linux-2.6-vs2.3.patch - pldized (nfs4 chan...

[zbyniu]

Author: zbyniu                       Date: Mon Mar 17 01:27:36 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6_22
---- Log message:
- pldized (nfs4 changes)

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.4.11.2.11.2.16 -> 1.2.4.11.2.11.2.17) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11.2.16 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11.2.17
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.11.2.16	Mon Mar 17 02:26:24 2008
+++ SOURCES/linux-2.6-vs2.3.patch	Mon Mar 17 02:27:29 2008
@@ -7856,17 +7856,17 @@
 --- linux-2.6.22.19/fs/nfs/super.c	2008-03-14 20:19:03 +0100
 +++ linux-2.6.22.19-vs2.3.0.33/fs/nfs/super.c	2007-09-30 14:58:01 +0200
 @@ -45,6 +45,7 @@
- #include <linux/inet.h>
  #include <linux/nfs_xdr.h>
  #include <linux/magic.h>
+ #include <linux/parser.h>
 +#include <linux/vs_tag.h>
  
  #include <asm/system.h>
  #include <asm/uaccess.h>
 @@ -291,6 +292,7 @@ static void nfs_show_mount_options(struc
- 		{ NFS_MOUNT_NONLM, ",nolock", "" },
  		{ NFS_MOUNT_NOACL, ",noacl", "" },
  		{ NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" },
+ 		{ NFS_MOUNT_UNSHARED, ",nosharecache", ""},
 +		{ NFS_MOUNT_TAGGED, ",tag", "" },
  		{ 0, NULL, NULL }
  	};
@@ -7993,9 +7993,9 @@
 --- linux-2.6.22.19/fs/nfsd/nfs4xdr.c	2008-03-14 20:19:03 +0100
 +++ linux-2.6.22.19-vs2.3.0.33/fs/nfsd/nfs4xdr.c	2008-03-14 21:11:30 +0100
 @@ -56,6 +56,7 @@
- #include <linux/nfsd_idmap.h>
- #include <linux/nfs4.h>
  #include <linux/nfs4_acl.h>
+ #include <linux/sunrpc/gss_api.h>
+ #include <linux/sunrpc/svcauth_gss.h>
 +#include <linux/vs_tag.h>
  
  #define NFSDDBG_FACILITY		NFSDDBG_XDR
@@ -8132,8 +8132,8 @@
  	 */
  	if (!(acc & MAY_LOCAL_ACCESS))
  		if (acc & (MAY_WRITE | MAY_SATTR | MAY_TRUNC)) {
--			if (EX_RDONLY(exp) || IS_RDONLY(inode))
-+			if (EX_RDONLY(exp) || IS_RDONLY(inode)
+-			if (EX_RDONLY(exp, rqstp) || IS_RDONLY(inode))
++			if (EX_RDONLY(exp, rqstp) || IS_RDONLY(inode)
 +				|| MNT_IS_RDONLY(exp->ex_mnt))
  				return nfserr_rofs;
  			if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
@@ -11606,9 +11606,9 @@
 --- linux-2.6.22.19/include/linux/nfs_mount.h	2007-07-09 13:20:00 +0200
 +++ linux-2.6.22.19-vs2.3.0.33/include/linux/nfs_mount.h	2007-08-05 20:53:13 +0200
 @@ -62,6 +62,7 @@ struct nfs_mount_data {
- #define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
  #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
  #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
+ #define NFS_MOUNT_UNSHARED	0x8000	/* 5 */
 +#define NFS_MOUNT_TAGGED	0x8000	/* context tagging */
  #define NFS_MOUNT_FLAGMASK	0xFFFF
  
@@ -11935,11 +11935,11 @@
 --- linux-2.6.22.19/include/linux/sunrpc/clnt.h	2007-07-09 13:20:01 +0200
 +++ linux-2.6.22.19-vs2.3.0.33/include/linux/sunrpc/clnt.h	2007-08-05 20:53:13 +0200
 @@ -43,7 +43,8 @@ struct rpc_clnt {
+ 	unsigned int		cl_softrtry : 1,/* soft timeouts */
+ 				cl_intr     : 1,/* interruptible */
  				cl_discrtry : 1,/* disconnect before retry */
- 				cl_autobind : 1,/* use getport() */
- 				cl_oneshot  : 1,/* dispose after use */
--				cl_dead     : 1;/* abandoned */
-+				cl_dead     : 1,/* abandoned */
+-				cl_autobind : 1;/* use getport() */
++				cl_autobind : 1,/* use getport() */
 +				cl_tag      : 1;/* context tagging */
  
  	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.11.2.16&r2=1.2.4.11.2.11.2.17&f=u