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 04/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_lock.c
Date: Mon, 30 Oct 2017 15:59:27 +1100 [thread overview]
Message-ID: <150933956714.22133.9335034661380882104.stgit@noble> (raw)
In-Reply-To: <150933945578.22133.8029060522107378499.stgit@noble>
This makes some slightly-confusing code a bit clearer, and
avoids the need for 'tmp'.
Signed-off-by: NeilBrown <neilb@suse.com>
---
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index ed061cc46986..036a509eb515 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -885,17 +885,15 @@ static void search_granted_lock(struct list_head *queue,
struct ldlm_lock *req,
struct sl_insert_point *prev)
{
- struct list_head *tmp;
struct ldlm_lock *lock, *mode_end, *policy_end;
- list_for_each(tmp, queue) {
- lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ list_for_each_entry(lock, queue, l_res_link) {
mode_end = list_prev_entry(lock, l_sl_mode);
if (lock->l_req_mode != req->l_req_mode) {
/* jump to last lock of mode group */
- tmp = &mode_end->l_res_link;
+ lock = mode_end;
continue;
}
@@ -932,9 +930,7 @@ static void search_granted_lock(struct list_head *queue,
break;
/* go to next policy group within mode group */
- tmp = policy_end->l_res_link.next;
- lock = list_entry(tmp, struct ldlm_lock,
- l_res_link);
+ lock = list_next_entry(policy_end, l_res_link);
} /* loop over policy groups within the mode group */
/* insert point is last lock of the mode group,
next prev parent reply other threads:[~2017-10-30 5:00 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 01/10] staging: lustre: use list_last_entry to simplify fld_cache_shrink 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 09/10] staging: lustre: simplfy lov_finish_set() NeilBrown
2017-10-30 4:59 ` [PATCH 07/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_resource.c 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-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 ` NeilBrown [this message]
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=150933956714.22133.9335034661380882104.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®