SOURCES (Titanium): linux-2.6-vs2.3.patch - merged delta-rpc-fix01.diff and...

[hawk]

Author: hawk                         Date: Mon Sep  1 09:34:43 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- merged delta-rpc-fix01.diff and delta-cowbl-fix02.diff

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.1.2.17.2.17 -> 1.1.2.17.2.18) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.17 SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.18
--- SOURCES/linux-2.6-vs2.3.patch:1.1.2.17.2.17	Fri Aug 29 13:59:44 2008
+++ SOURCES/linux-2.6-vs2.3.patch	Mon Sep  1 11:34:36 2008
@@ -5368,7 +5368,7 @@
  	acc_mode = ACC_MODE(flag);
  
  	/* O_TRUNC implies we need access checks for write permissions */
-@@ -1893,6 +1966,22 @@ ok:
+@@ -1893,6 +1966,25 @@ ok:
  			goto exit;
  	}
  	error = may_open(&nd, acc_mode, flag);
@@ -5378,15 +5378,18 @@
 +		dentry = cow_break_link(pathname);
 +		if (IS_ERR(dentry)) {
 +			error = PTR_ERR(dentry);
-+			goto exit;
++			goto exit_cow;
 +		}
 +		dput(dentry);
++		if (will_write)
++			mnt_drop_write(nd.path.mnt);
 +		release_open_intent(&nd);
 +		path_put(&nd.path);
 +		flag = rflag;
 +		mode = rmode;
 +		goto restart;
 +	}
++exit_cow:
 +#endif
  	if (error) {
  		if (will_write)
@@ -28152,15 +28155,22 @@
  
  #ifdef RPC_DEBUG
  # define RPCDBG_FACILITY	RPCDBG_AUTH
-@@ -353,6 +354,8 @@ rpcauth_lookupcred(struct rpc_auth *auth
+@@ -353,6 +354,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
  	struct auth_cred acred = {
  		.uid = current->fsuid,
  		.gid = current->fsgid,
 +		.tag = dx_current_tag(),
-+		.tag = dx_current_tag(),
  		.group_info = current->group_info,
  	};
  	struct rpc_cred *ret;
+@@ -401,6 +400,7 @@ rpcauth_bind_root_cred(struct rpc_task *
+ 	struct auth_cred acred = {
+ 		.uid = 0,
+ 		.gid = 0,
++		.tag = dx_current_tag(),
+ 	};
+ 	struct rpc_cred *ret;
+ 
 diff -NurpP --minimal linux-2.6.26.3/net/sunrpc/auth_unix.c linux-2.6.26.3-vs2.3.0.35/net/sunrpc/auth_unix.c
 --- linux-2.6.26.3/net/sunrpc/auth_unix.c	2008-07-14 17:23:05.000000000 -0400
 +++ linux-2.6.26.3-vs2.3.0.35/net/sunrpc/auth_unix.c	2008-07-17 16:38:01.000000000 -0400
================================================================

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