From c896babf66f539bf77d4dd6ee61e814739994a1e Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Mon, 17 Dec 2007 16:19:52 -0800
Subject: [PATCH] --- yaml --- r: 74971 b: refs/heads/master c:
 459e216429a04779216b61f0fb61938a459fd1ca h: refs/heads/master i:   74969:
 ed752564a4ff2aa18797fb3d84e27cee60699ea2   74967:
 944fadbe45e2cf4a7a2db9a27035f52148a07fc3 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ecryptfs/keystore.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7d32f5bc7d54..e65b850ce7a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60af880339aae440293a0c8e93178fdcb41f8a29
+refs/heads/master: 459e216429a04779216b61f0fb61938a459fd1ca
diff --git a/trunk/fs/ecryptfs/keystore.c b/trunk/fs/ecryptfs/keystore.c
index 263fed88c0ca..f458c1f35565 100644
--- a/trunk/fs/ecryptfs/keystore.c
+++ b/trunk/fs/ecryptfs/keystore.c
@@ -1860,7 +1860,7 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
 	struct ecryptfs_global_auth_tok *new_auth_tok;
 	int rc = 0;
 
-	new_auth_tok = kmem_cache_alloc(ecryptfs_global_auth_tok_cache,
+	new_auth_tok = kmem_cache_zalloc(ecryptfs_global_auth_tok_cache,
 					GFP_KERNEL);
 	if (!new_auth_tok) {
 		rc = -ENOMEM;