diff options
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 01ebfd0bdad..eeac97bb3bf 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c @@ -2083,7 +2083,6 @@ static void dlm_finish_local_lockres_recovery(struct dlm_ctxt *dlm,  					      u8 dead_node, u8 new_master)  {  	int i; -	struct hlist_node *hash_iter;  	struct hlist_head *bucket;  	struct dlm_lock_resource *res, *next; @@ -2114,7 +2113,7 @@ static void dlm_finish_local_lockres_recovery(struct dlm_ctxt *dlm,  	 * if necessary */  	for (i = 0; i < DLM_HASH_BUCKETS; i++) {  		bucket = dlm_lockres_hash(dlm, i); -		hlist_for_each_entry(res, hash_iter, bucket, hash_node) { +		hlist_for_each_entry(res, bucket, hash_node) {  			if (!(res->state & DLM_LOCK_RES_RECOVERING))  				continue; @@ -2273,7 +2272,6 @@ static void dlm_free_dead_locks(struct dlm_ctxt *dlm,  static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node)  { -	struct hlist_node *iter;  	struct dlm_lock_resource *res;  	int i;  	struct hlist_head *bucket; @@ -2299,7 +2297,7 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node)  	 */  	for (i = 0; i < DLM_HASH_BUCKETS; i++) {  		bucket = dlm_lockres_hash(dlm, i); -		hlist_for_each_entry(res, iter, bucket, hash_node) { +		hlist_for_each_entry(res, bucket, hash_node) {   			/* always prune any $RECOVERY entries for dead nodes,   			 * otherwise hangs can occur during later recovery */  			if (dlm_is_recovery_lock(res->lockname.name,  |