Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eb50608 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: use list_for_each_entry in ldlm_resource.c 



Having a stand-alone "list_entry()" call is often a sign
that something like "list_for_each_entry()" would
make the code clearer.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb830bef

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+7 −13
Original line number Diff line number Diff line
@@ -752,24 +752,22 @@ extern struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock); 
static void cleanup_resource(struct ldlm_resource *res, struct list_head *q,

			     __u64 flags)

{

	struct list_head *tmp;

	int rc = 0;

	bool local_only = !!(flags & LDLM_FL_LOCAL_ONLY);



	do {

		struct ldlm_lock *lock = NULL;

		struct ldlm_lock *lock = NULL, *tmp;

		struct lustre_handle lockh;



		/* First, we look for non-cleaned-yet lock

		 * all cleaned locks are marked by CLEANED flag.

		 */

		lock_res(res);

		list_for_each(tmp, q) {

			lock = list_entry(tmp, struct ldlm_lock, l_res_link);

			if (ldlm_is_cleaned(lock)) {

				lock = NULL;

		list_for_each_entry(tmp, q, l_res_link) {

			if (ldlm_is_cleaned(tmp))

				continue;

			}



			lock = tmp;

			LDLM_LOCK_GET(lock);

			ldlm_set_cleaned(lock);

			break;
@@ -1283,19 +1281,15 @@ void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc) 
 */

void ldlm_dump_all_namespaces(enum ldlm_side client, int level)

{

	struct list_head *tmp;

	struct ldlm_namespace *ns;



	if (!((libcfs_debug | D_ERROR) & level))

		return;



	mutex_lock(ldlm_namespace_lock(client));



	list_for_each(tmp, ldlm_namespace_list(client)) {

		struct ldlm_namespace *ns;



		ns = list_entry(tmp, struct ldlm_namespace, ns_list_chain);

	list_for_each_entry(ns, ldlm_namespace_list(client), ns_list_chain)

		ldlm_namespace_dump(level, ns);

	}



	mutex_unlock(ldlm_namespace_lock(client));

}