Commit eb4f73b4 authored Jan 08, 2015 by Joseph Qi Committed by Linus Torvalds Jan 08, 2015

ocfs2: remove bogus check in dlm_process_recovery_data



In dlm_process_recovery_data, only when dlm_new_lock failed the ret will
be set to -ENOMEM.  And in this case, newlock is definitely NULL.  So
test newlock is meaningless, remove it.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Reviewed-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bdec4196

fs/ocfs2/dlm/dlmrecovery.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -2023,11 +2023,8 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm,
		dlm_lockres_drop_inflight_ref(dlm, res);
		spin_unlock(&res->spinlock);

		if (ret < 0) {
		if (ret < 0)
		mlog_errno(ret);
		if (newlock)
		dlm_lock_put(newlock);
		}

		return ret;
		}