The patch titled
Subject: ocfs2: remove unneeded 'rc' for kfree()
has been removed from the -mm tree. Its filename was
ocfs2-remove-unneeded-rc-for-kfree.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Subject: ocfs2: remove unneeded 'rc' for kfree()
If kzalloc() failed, just goto 'out' label and 'out_free' label doesn't
need to check 'rc' variable.
Signed-off-by: Daeseok Youn <daeseok.youn@xxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/stack_o2cb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN fs/ocfs2/stack_o2cb.c~ocfs2-remove-unneeded-rc-for-kfree fs/ocfs2/stack_o2cb.c
--- a/fs/ocfs2/stack_o2cb.c~ocfs2-remove-unneeded-rc-for-kfree
+++ a/fs/ocfs2/stack_o2cb.c
@@ -347,7 +347,7 @@ static int o2cb_cluster_connect(struct o
priv = kzalloc(sizeof(struct o2dlm_private), GFP_KERNEL);
if (!priv) {
rc = -ENOMEM;
- goto out_free;
+ goto out;
}
/* This just fills the structure in. It is safe to pass conn. */
@@ -376,8 +376,7 @@ static int o2cb_cluster_connect(struct o
dlm_register_eviction_cb(dlm, &priv->op_eviction_cb);
out_free:
- if (rc)
- kfree(conn->cc_private);
+ kfree(conn->cc_private);
out:
return rc;
_
Patches currently in -mm which might be from daeseok.youn@xxxxxxxxx are
ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.patch
ocfs2-remove-unneeded-variable-status.patch
ocfs2-remove-extra-mlog_errno-call-in-__ocfs2_add_entry.patch
ocfs2-need-to-handle-error-for-ocfs2_journal_access_di-call.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
