struct dlm_migratable_lockres *mres)
 {
        struct dlm_migratable_lock *ml;
-       struct list_head *queue, *iter;
+       struct list_head *queue;
        struct list_head *tmpq = NULL;
        struct dlm_lock *newlock = NULL;
        struct dlm_lockstatus *lksb = NULL;
                        spin_lock(&res->spinlock);
                        for (j = DLM_GRANTED_LIST; j <= DLM_BLOCKED_LIST; j++) {
                                tmpq = dlm_list_idx_to_ptr(res, j);
-                               list_for_each(iter, tmpq) {
-                                       lock = list_entry(iter,
-                                                 struct dlm_lock, list);
+                               list_for_each_entry(lock, tmpq, list) {
                                        if (lock->ml.cookie == ml->cookie)
                                                break;
                                        lock = NULL;