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 10/10] staging: lustre: obdclass: simplify cl_lock_fini()
Date: Mon, 30 Oct 2017 15:59:27 +1100 [thread overview]
Message-ID: <150933956737.22133.10532579319852492812.stgit@noble> (raw)
In-Reply-To: <150933945578.22133.8029060522107378499.stgit@noble>
Using list_first_entry_or_null() makes this (slightly)
simpler.
Signed-off-by: NeilBrown <neilb@suse.com>
---
drivers/staging/lustre/lustre/obdclass/cl_lock.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/cl_lock.c b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
index 20e64051d2d6..fa97f4b39bd1 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_lock.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_lock.c
@@ -78,13 +78,12 @@ EXPORT_SYMBOL(cl_lock_slice_add);
void cl_lock_fini(const struct lu_env *env, struct cl_lock *lock)
{
+ struct cl_lock_slice *slice;
cl_lock_trace(D_DLMTRACE, env, "destroy lock", lock);
- while (!list_empty(&lock->cll_layers)) {
- struct cl_lock_slice *slice;
-
- slice = list_entry(lock->cll_layers.next,
- struct cl_lock_slice, cls_linkage);
+ while ((slice = list_first_entry_or_null(&lock->cll_layers,
+ struct cl_lock_slice,
+ cls_linkage)) != NULL) {
list_del_init(lock->cll_layers.next);
slice->cls_ops->clo_fini(env, slice);
}
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 04/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_lock.c 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 07/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_resource.c NeilBrown
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 02/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_extent_shift_kms() 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 ` 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=150933956737.22133.10532579319852492812.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®