From 51f208162e57d66c1dfa5efeb4e0fc204001d7fc Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 12 Feb 2013 11:03:49 -0700 Subject: [PATCH] --- yaml --- r: 360855 b: refs/heads/master c: 1101d58669a92ed9c9f4c7281404fb1e067a1e28 h: refs/heads/master i: 360853: 812141029e709737da1235e437f4f5ba8a0c5344 360851: 0ebcf54b74eeb525f2e9243eb89efec1fc19ce24 360847: d2a169ad1dd8daa4e99f6fd153e008c392ae42e5 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/messaging.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e765c96d6b74..ab615690a8c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a46741804a4226cd837d1246eed95d4161f7159 +refs/heads/master: 1101d58669a92ed9c9f4c7281404fb1e067a1e28 diff --git a/trunk/fs/ecryptfs/messaging.c b/trunk/fs/ecryptfs/messaging.c index 5fa2471796c2..d5c7297c5816 100644 --- a/trunk/fs/ecryptfs/messaging.c +++ b/trunk/fs/ecryptfs/messaging.c @@ -97,8 +97,7 @@ static void ecryptfs_msg_ctx_free_to_alloc(struct ecryptfs_msg_ctx *msg_ctx) void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx) { list_move(&(msg_ctx->node), &ecryptfs_msg_ctx_free_list); - if (msg_ctx->msg) - kfree(msg_ctx->msg); + kfree(msg_ctx->msg); msg_ctx->msg = NULL; msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_FREE; }