From: NeilBrown <neilb@suse.com>
To: Oleg Drokin <oleg.drokin@intel.com>,
Andreas Dilger <andreas.dilger@intel.com>,
James Simmons <jsimmons@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, lustre-devel@lists.lustre.org
Subject: [PATCH 07/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_resource.c
Date: Mon, 30 Oct 2017 15:59:27 +1100 [thread overview]
Message-ID: <150933956725.22133.1599266866891541124.stgit@noble> (raw)
In-Reply-To: <150933945578.22133.8029060522107378499.stgit@noble>
Signed-off-by: NeilBrown <neilb@suse.com>
---
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index c2ddf7312571..980d970174d8 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -751,24 +751,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;
@@ -1282,19 +1280,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));
}
next prev parent reply other threads:[~2017-10-30 5:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 4:59 [PATCH 00/10] staging: lustre: assorted code improvements for list manipulations NeilBrown
2017-10-30 4:59 ` [PATCH 03/10] staging: lustre: ldlm: use list_first_entry in ldlm_lock NeilBrown
2017-10-30 4:59 ` [PATCH 06/10] staging: lustre: ldlm: minor list_entry improvements in ldlm_request.c NeilBrown
2017-10-30 4:59 ` [PATCH 04/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_lock.c NeilBrown
2017-10-30 4:59 ` NeilBrown [this message]
2017-10-30 4:59 ` [PATCH 09/10] staging: lustre: simplfy lov_finish_set() NeilBrown
2017-10-30 4:59 ` [PATCH 08/10] staging: lustre: lov: use list_for_each_entry in lov_obd.c NeilBrown
2017-11-24 15:43 ` Greg Kroah-Hartman
2017-11-29 3:01 ` NeilBrown
2017-11-29 9:40 ` Greg Kroah-Hartman
2017-11-29 11:37 ` NeilBrown
2017-10-30 4:59 ` [PATCH 01/10] staging: lustre: use list_last_entry to simplify fld_cache_shrink NeilBrown
2017-10-30 4:59 ` [PATCH 05/10] staging: lustre: ldlm: use list_first_entry in ldlm_lockd.c NeilBrown
2017-10-30 4:59 ` [PATCH 02/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_extent_shift_kms() NeilBrown
2017-10-30 4:59 ` [PATCH 10/10] staging: lustre: obdclass: simplify cl_lock_fini() NeilBrown
2017-11-24 15:44 ` [PATCH 00/10] staging: lustre: assorted code improvements for list manipulations Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=150933956725.22133.1599266866891541124.stgit@noble \
--to=neilb@suse.com \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jsimmons@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®