[PATCH 07/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_resource.c

[NeilBrown]

Signed-off-by: NeilBrown 
---
 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));
 }

[PATCH 07/10] staging: lustre: ldlm: use list_for_each_entry in ldlm_resource.c

[NeilBrown]

Signed-off-by: NeilBrown 
---
 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));
 }