Commit 81cd1ae9 authored by Jakob Koschel's avatar Jakob Koschel Committed by Andrew Morton
Browse files

ocfs2: replace usage of found with dedicated list iterator variable 

To move the list iterator variable into the list_for_each_entry_*() macro
in the future it should be avoided to use the list iterator variable after
the loop body.

To *never* use the list iterator variable after the loop it was concluded
to use a separate iterator variable instead of a found boolean [1].

This removes the need to use a found variable and simply checking if the
variable was set, can determine if the break/goto was hit.

Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/
Link: https://lkml.kernel.org/r/20220324071650.61168-1-jakobkoschel@gmail.com


Signed-off-by: default avatarJakob Koschel <jakobkoschel@gmail.com>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent dec81a53

fs/ocfs2/dlm/dlmunlock.c

+10 −11
Original line number Diff line number Diff line
@@ -392,9 +392,9 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
	struct dlm_ctxt *dlm = data;

	struct dlm_unlock_lock *unlock = (struct dlm_unlock_lock *)msg->buf;

	struct dlm_lock_resource *res = NULL;

	struct dlm_lock *lock = NULL;

	struct dlm_lock *lock = NULL, *iter;

	enum dlm_status status = DLM_NORMAL;

	int found = 0, i;

	int i;

	struct dlm_lockstatus *lksb = NULL;

	int ignore;

	u32 flags;
@@ -437,7 +437,6 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
	}



	queue=&res->granted;

	found = 0;

	spin_lock(&res->spinlock);

	if (res->state & DLM_LOCK_RES_RECOVERING) {

		spin_unlock(&res->spinlock);
@@ -461,21 +460,21 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
	}



	for (i=0; i<3; i++) {

		list_for_each_entry(lock, queue, list) {

			if (lock->ml.cookie == unlock->cookie &&

		    	    lock->ml.node == unlock->node_idx) {

				dlm_lock_get(lock);

				found = 1;

		list_for_each_entry(iter, queue, list) {

			if (iter->ml.cookie == unlock->cookie &&

			    iter->ml.node == unlock->node_idx) {

				dlm_lock_get(iter);

				lock = iter;

				break;

			}

		}

		if (found)

		if (lock)

			break;

		/* scan granted -> converting -> blocked queues */

		queue++;

	}

	spin_unlock(&res->spinlock);

	if (!found) {

	if (!lock) {

		status = DLM_IVLOCKID;

		goto not_found;

	}
@@ -505,7 +504,7 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
	dlm_kick_thread(dlm, res);



not_found:

	if (!found)

	if (!lock)

		mlog(ML_ERROR, "failed to find lock to unlock! "

			       "cookie=%u:%llu\n",

		     dlm_get_lock_cookie_node(be64_to_cpu(unlock->cookie)),

fs/ocfs2/quota_local.c

+5 −5
Original line number Diff line number Diff line
@@ -921,19 +921,19 @@ static struct ocfs2_quota_chunk *ocfs2_find_free_entry(struct super_block *sb, 
{

	struct mem_dqinfo *info = sb_dqinfo(sb, type);

	struct ocfs2_mem_dqinfo *oinfo = info->dqi_priv;

	struct ocfs2_quota_chunk *chunk;

	struct ocfs2_quota_chunk *chunk = NULL, *iter;

	struct ocfs2_local_disk_chunk *dchunk;

	int found = 0, len;



	list_for_each_entry(chunk, &oinfo->dqi_chunk, qc_chunk) {

	list_for_each_entry(iter, &oinfo->dqi_chunk, qc_chunk) {

		dchunk = (struct ocfs2_local_disk_chunk *)

						chunk->qc_headerbh->b_data;

						iter->qc_headerbh->b_data;

		if (le32_to_cpu(dchunk->dqc_free) > 0) {

			found = 1;

			chunk = iter;

			break;

		}

	}

	if (!found)

	if (!chunk)

		return NULL;



	if (chunk->qc_num < oinfo->dqi_chunks - 1) {