From 6c3d97a50e862d4e301e025d00df2f5976f871b6 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 23 Mar 2009 01:47:11 -0400
Subject: [PATCH] --- yaml --- r: 143695 b: refs/heads/master c:
 d9fb5c091b419e0495c50c1cce9e4cf9f7105072 h: refs/heads/master i:   143693:
 e1153a1b68bf8d2661d328ac97b4a982857376e7   143691:
 5ad143c636251ef5c13dcd617a64cf3a84541e32   143687:
 ad96a395a40e5afa6e6104d915c6f07afa070250   143679:
 8eff933d57f48405d29fe56f905efa55e1ae8087 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/cifs/cifs_spnego.c | 2 +-
 trunk/fs/cifs/dns_resolve.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index edba292e78b0..84d6e05ab425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5144ebf408ed08380917126493450ee22e63fe3f
+refs/heads/master: d9fb5c091b419e0495c50c1cce9e4cf9f7105072
diff --git a/trunk/fs/cifs/cifs_spnego.c b/trunk/fs/cifs/cifs_spnego.c
index 3fd3a9df043a..67bf93a40d2e 100644
--- a/trunk/fs/cifs/cifs_spnego.c
+++ b/trunk/fs/cifs/cifs_spnego.c
@@ -41,7 +41,7 @@ cifs_spnego_key_instantiate(struct key *key, const void *data, size_t datalen)
 
 	/* attach the data */
 	memcpy(payload, data, datalen);
-	rcu_assign_pointer(key->payload.data, payload);
+	key->payload.data = payload;
 	ret = 0;
 
 error:
diff --git a/trunk/fs/cifs/dns_resolve.c b/trunk/fs/cifs/dns_resolve.c
index 1e0c1bd8f2e4..df4a306f697e 100644
--- a/trunk/fs/cifs/dns_resolve.c
+++ b/trunk/fs/cifs/dns_resolve.c
@@ -78,7 +78,7 @@ dns_resolver_instantiate(struct key *key, const void *data,
 	}
 
 	key->type_data.x[0] = datalen;
-	rcu_assign_pointer(key->payload.data, ip);
+	key->payload.data = ip;
 
 	return rc;
 }