ocfs2: use list_for_each_entry() instead of list_for_each()

[dan.carpenter@oracle.com: fix up some NULL dereference bugs]
Signed-off-by: Dong Fang <yp.fangdong@gmail.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jeff Liu <jeff.liu@oracle.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 7 insertions, 11 deletions

diff --git a/fs/ocfs2/dlm/dlmconvert.c b/fs/ocfs2/dlm/dlmconvert.c
index 29a886d1e82c..e36d63ff1783 100644
--- a/fs/ocfs2/dlm/dlmconvert.c
+++ b/fs/ocfs2/dlm/dlmconvert.c
@@ -123,7 +123,6 @@ static enum dlm_status __dlmconvert_master(struct dlm_ctxt *dlm,
                                            int *kick_thread)
 {
         enum dlm_status status = DLM_NORMAL;
-        struct list_head *iter;
         struct dlm_lock *tmplock=NULL;
 
         assert_spin_locked(&res->spinlock);
@@ -185,16 +184,14 @@ static enum dlm_status __dlmconvert_master(struct dlm_ctxt *dlm,
 
         /* upconvert from here on */
         status = DLM_NORMAL;
-        list_for_each(iter, &res->granted) {
-                tmplock = list_entry(iter, struct dlm_lock, list);
+        list_for_each_entry(tmplock, &res->granted, list) {
                 if (tmplock == lock)
                         continue;
                 if (!dlm_lock_compatible(tmplock->ml.type, type))
                         goto switch_queues;
         }
 
-        list_for_each(iter, &res->converting) {
-                tmplock = list_entry(iter, struct dlm_lock, list);
+        list_for_each_entry(tmplock, &res->converting, list) {
                 if (!dlm_lock_compatible(tmplock->ml.type, type))
                         goto switch_queues;
                 /* existing conversion requests take precedence */
@@ -424,8 +421,8 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data,
         struct dlm_ctxt *dlm = data;
         struct dlm_convert_lock *cnv = (struct dlm_convert_lock *)msg->buf;
         struct dlm_lock_resource *res = NULL;
-        struct list_head *iter;
         struct dlm_lock *lock = NULL;
+        struct dlm_lock *tmp_lock;
         struct dlm_lockstatus *lksb;
         enum dlm_status status = DLM_NORMAL;
         u32 flags;
@@ -471,14 +468,13 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data,
                 dlm_error(status);
                 goto leave;
         }
-        list_for_each(iter, &res->granted) {
-                lock = list_entry(iter, struct dlm_lock, list);
-                if (lock->ml.cookie == cnv->cookie &&
-                    lock->ml.node == cnv->node_idx) {
+        list_for_each_entry(tmp_lock, &res->granted, list) {
+                if (tmp_lock->ml.cookie == cnv->cookie &&
+                    tmp_lock->ml.node == cnv->node_idx) {
+                        lock = tmp_lock;
                         dlm_lock_get(lock);
                         break;
                 }
-                lock = NULL;
         }
         spin_unlock(&res->spinlock);
         if (!lock) {