From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 24 Jul 2016 21:09:02 +0000 (-0400)
Subject: Merge branch 'nfs-rdma'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1592c4d62a89bbca895c568d65ce290dfbc36ecc;p=linux-beck.git

Merge branch 'nfs-rdma'
---

1592c4d62a89bbca895c568d65ce290dfbc36ecc
diff --cc net/sunrpc/auth_gss/auth_gss.c
index 813a3cdfb573,bca3537efffd..23c8e7c39656
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@@ -1015,9 -1015,10 +1015,11 @@@ gss_create_new(struct rpc_auth_create_a
  	auth = &gss_auth->rpc_auth;
  	auth->au_cslack = GSS_CRED_SLACK >> 2;
  	auth->au_rslack = GSS_VERF_SLACK >> 2;
 +	auth->au_flags = 0;
  	auth->au_ops = &authgss_ops;
  	auth->au_flavor = flavor;
+ 	if (gss_pseudoflavor_to_datatouch(gss_auth->mech, flavor))
+ 		auth->au_flags |= RPCAUTH_AUTH_DATATOUCH;
  	atomic_set(&auth->au_count, 1);
  	kref_init(&gss_auth->kref);