lockspace.c (c04fecb4d9f7753e0cbff7edd03ec68f8721cdce) lockspace.c (1d7c484eeb167fc374294e38ae402de4097c8611)
1/******************************************************************************
2*******************************************************************************
3**
4** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
5** Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
6**
7** This copyrighted material is made available to anyone wishing to use,
8** modify, copy, or redistribute it subject to the terms and conditions

--- 551 unchanged lines hidden (view full) ---

560
561 ls->ls_slot = 0;
562 ls->ls_num_slots = 0;
563 ls->ls_slots_size = 0;
564 ls->ls_slots = NULL;
565
566 INIT_LIST_HEAD(&ls->ls_recover_list);
567 spin_lock_init(&ls->ls_recover_list_lock);
1/******************************************************************************
2*******************************************************************************
3**
4** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
5** Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
6**
7** This copyrighted material is made available to anyone wishing to use,
8** modify, copy, or redistribute it subject to the terms and conditions

--- 551 unchanged lines hidden (view full) ---

560
561 ls->ls_slot = 0;
562 ls->ls_num_slots = 0;
563 ls->ls_slots_size = 0;
564 ls->ls_slots = NULL;
565
566 INIT_LIST_HEAD(&ls->ls_recover_list);
567 spin_lock_init(&ls->ls_recover_list_lock);
568 idr_init(&ls->ls_recover_idr);
569 spin_lock_init(&ls->ls_recover_idr_lock);
568 ls->ls_recover_list_count = 0;
569 ls->ls_local_handle = ls;
570 init_waitqueue_head(&ls->ls_wait_general);
571 INIT_LIST_HEAD(&ls->ls_root_list);
572 init_rwsem(&ls->ls_root_sem);
573
574 down_write(&ls->ls_in_recovery);
575

--- 55 unchanged lines hidden (view full) ---

631 out_recoverd:
632 dlm_recoverd_stop(ls);
633 out_callback:
634 dlm_callback_stop(ls);
635 out_delist:
636 spin_lock(&lslist_lock);
637 list_del(&ls->ls_list);
638 spin_unlock(&lslist_lock);
570 ls->ls_recover_list_count = 0;
571 ls->ls_local_handle = ls;
572 init_waitqueue_head(&ls->ls_wait_general);
573 INIT_LIST_HEAD(&ls->ls_root_list);
574 init_rwsem(&ls->ls_root_sem);
575
576 down_write(&ls->ls_in_recovery);
577

--- 55 unchanged lines hidden (view full) ---

633 out_recoverd:
634 dlm_recoverd_stop(ls);
635 out_callback:
636 dlm_callback_stop(ls);
637 out_delist:
638 spin_lock(&lslist_lock);
639 list_del(&ls->ls_list);
640 spin_unlock(&lslist_lock);
641 idr_destroy(&ls->ls_recover_idr);
639 kfree(ls->ls_recover_buf);
640 out_lkbfree:
641 idr_destroy(&ls->ls_lkbidr);
642 vfree(ls->ls_rsbtbl);
643 out_lsfree:
644 if (do_unreg)
645 kobject_put(&ls->ls_kobj);
646 else

--- 225 unchanged lines hidden --- 		642 kfree(ls->ls_recover_buf);
643 out_lkbfree:
644 idr_destroy(&ls->ls_lkbidr);
645 vfree(ls->ls_rsbtbl);
646 out_lsfree:
647 if (do_unreg)
648 kobject_put(&ls->ls_kobj);
649 else

--- 225 unchanged lines hidden ---