diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmconvert.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmconvert.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/ocfs2/dlm/dlmconvert.c b/fs/ocfs2/dlm/dlmconvert.c index 8285228d9e37..70888b31e751 100644 --- a/fs/ocfs2/dlm/dlmconvert.c +++ b/fs/ocfs2/dlm/dlmconvert.c | |||
@@ -231,8 +231,7 @@ switch_queues: | |||
231 | 231 | ||
232 | lock->ml.convert_type = type; | 232 | lock->ml.convert_type = type; |
233 | /* do not alter lock refcount. switching lists. */ | 233 | /* do not alter lock refcount. switching lists. */ |
234 | list_del_init(&lock->list); | 234 | list_move_tail(&lock->list, &res->converting); |
235 | list_add_tail(&lock->list, &res->converting); | ||
236 | 235 | ||
237 | unlock_exit: | 236 | unlock_exit: |
238 | spin_unlock(&lock->spinlock); | 237 | spin_unlock(&lock->spinlock); |
@@ -248,8 +247,7 @@ void dlm_revert_pending_convert(struct dlm_lock_resource *res, | |||
248 | struct dlm_lock *lock) | 247 | struct dlm_lock *lock) |
249 | { | 248 | { |
250 | /* do not alter lock refcount. switching lists. */ | 249 | /* do not alter lock refcount. switching lists. */ |
251 | list_del_init(&lock->list); | 250 | list_move_tail(&lock->list, &res->granted); |
252 | list_add_tail(&lock->list, &res->granted); | ||
253 | lock->ml.convert_type = LKM_IVMODE; | 251 | lock->ml.convert_type = LKM_IVMODE; |
254 | lock->lksb->flags &= ~(DLM_LKSB_GET_LVB|DLM_LKSB_PUT_LVB); | 252 | lock->lksb->flags &= ~(DLM_LKSB_GET_LVB|DLM_LKSB_PUT_LVB); |
255 | } | 253 | } |
@@ -294,8 +292,7 @@ enum dlm_status dlmconvert_remote(struct dlm_ctxt *dlm, | |||
294 | res->state |= DLM_LOCK_RES_IN_PROGRESS; | 292 | res->state |= DLM_LOCK_RES_IN_PROGRESS; |
295 | /* move lock to local convert queue */ | 293 | /* move lock to local convert queue */ |
296 | /* do not alter lock refcount. switching lists. */ | 294 | /* do not alter lock refcount. switching lists. */ |
297 | list_del_init(&lock->list); | 295 | list_move_tail(&lock->list, &res->converting); |
298 | list_add_tail(&lock->list, &res->converting); | ||
299 | lock->convert_pending = 1; | 296 | lock->convert_pending = 1; |
300 | lock->ml.convert_type = type; | 297 | lock->ml.convert_type = type; |
301 | 298 | ||