staging: lustre: ldlm: minor list_entry improvements in ldlm_request.c

Small clarify improvements, and one local variable avoided.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index 02ea14c9b089e773246dead9d7070d7204793027..6aa37463db46b2548485fb10e795352dd612c5c0 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -1656,7 +1656,7 @@ int ldlm_cli_cancel_list(struct list_head *cancels, int count,
         */
        while (count > 0) {
                LASSERT(!list_empty(cancels));
-               lock = list_entry(cancels->next, struct ldlm_lock, l_bl_ast);
+               lock = list_first_entry(cancels, struct ldlm_lock, l_bl_ast);
                LASSERT(lock->l_conn_export);
 
                if (exp_connect_cancelset(lock->l_conn_export)) {
@@ -1780,7 +1780,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel_unused);
 static int ldlm_resource_foreach(struct ldlm_resource *res,
                                 ldlm_iterator_t iter, void *closure)
 {
-       struct list_head *tmp, *next;
+       struct ldlm_lock *tmp;
        struct ldlm_lock *lock;
        int rc = LDLM_ITER_CONTINUE;
 
@@ -1788,18 +1788,14 @@ static int ldlm_resource_foreach(struct ldlm_resource *res,
                return LDLM_ITER_CONTINUE;
 
        lock_res(res);
-       list_for_each_safe(tmp, next, &res->lr_granted) {
-               lock = list_entry(tmp, struct ldlm_lock, l_res_link);
-
+       list_for_each_entry_safe(lock, tmp, &res->lr_granted, l_res_link) {
                if (iter(lock, closure) == LDLM_ITER_STOP) {
                        rc = LDLM_ITER_STOP;
                        goto out;
                }
        }
 
-       list_for_each_safe(tmp, next, &res->lr_waiting) {
-               lock = list_entry(tmp, struct ldlm_lock, l_res_link);
-
+       list_for_each_entry_safe(lock, tmp, &res->lr_waiting, l_res_link) {
                if (iter(lock, closure) == LDLM_ITER_STOP) {
                        rc = LDLM_ITER_STOP;
                        goto out;