diff options
author | Joseph Qi <joseph.qi@huawei.com> | 2015-09-04 18:44:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 19:54:41 -0400 |
commit | f83c7b5e9fd633fe91128af116e6472a8c4d29a5 (patch) | |
tree | 043ec9d60ca53cc2dd6135317bd0d92a2e78f64f /fs/ocfs2/dlm/dlmrecovery.c | |
parent | 0e3d9eafb86183a33efc42f0beff5afceebbafba (diff) |
ocfs2/dlm: use list_for_each_entry instead of list_for_each
Use list_for_each_entry instead of list_for_each to simplify code.
Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/dlm/dlmrecovery.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index ce12e0b1a31f..d0e436dc6437 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
@@ -1776,7 +1776,7 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm, | |||
1776 | struct dlm_migratable_lockres *mres) | 1776 | struct dlm_migratable_lockres *mres) |
1777 | { | 1777 | { |
1778 | struct dlm_migratable_lock *ml; | 1778 | struct dlm_migratable_lock *ml; |
1779 | struct list_head *queue, *iter; | 1779 | struct list_head *queue; |
1780 | struct list_head *tmpq = NULL; | 1780 | struct list_head *tmpq = NULL; |
1781 | struct dlm_lock *newlock = NULL; | 1781 | struct dlm_lock *newlock = NULL; |
1782 | struct dlm_lockstatus *lksb = NULL; | 1782 | struct dlm_lockstatus *lksb = NULL; |
@@ -1821,9 +1821,7 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm, | |||
1821 | spin_lock(&res->spinlock); | 1821 | spin_lock(&res->spinlock); |
1822 | for (j = DLM_GRANTED_LIST; j <= DLM_BLOCKED_LIST; j++) { | 1822 | for (j = DLM_GRANTED_LIST; j <= DLM_BLOCKED_LIST; j++) { |
1823 | tmpq = dlm_list_idx_to_ptr(res, j); | 1823 | tmpq = dlm_list_idx_to_ptr(res, j); |
1824 | list_for_each(iter, tmpq) { | 1824 | list_for_each_entry(lock, tmpq, list) { |
1825 | lock = list_entry(iter, | ||
1826 | struct dlm_lock, list); | ||
1827 | if (lock->ml.cookie == ml->cookie) | 1825 | if (lock->ml.cookie == ml->cookie) |
1828 | break; | 1826 | break; |
1829 | lock = NULL; | 1827 | lock = NULL; |