Skip to content

Commit b2b9bff

Browse files
GuoqingJiangNeilBrown
authored andcommitted
md-cluster: remove the unused sb_lock
The sb_lock is not used anywhere, so let's remove it. Reviewed-by: Goldwyn Rodrigues <rgoldwyn@suse.com> Signed-off-by: Guoqing Jiang <gqjiang@suse.com> Signed-off-by: NeilBrown <neilb@suse.com>
1 parent 9e3072e commit b2b9bff

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

drivers/md/md-cluster.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ struct md_cluster_info {
5252
dlm_lockspace_t *lockspace;
5353
int slot_number;
5454
struct completion completion;
55-
struct dlm_lock_resource *sb_lock;
5655
struct mutex sb_mutex;
5756
struct dlm_lock_resource *bitmap_lockres;
5857
struct list_head suspend_list;
@@ -692,12 +691,6 @@ static int join(struct mddev *mddev, int nodes)
692691
ret = -ERANGE;
693692
goto err;
694693
}
695-
cinfo->sb_lock = lockres_init(mddev, "cmd-super",
696-
NULL, 0);
697-
if (!cinfo->sb_lock) {
698-
ret = -ENOMEM;
699-
goto err;
700-
}
701694
/* Initiate the communication resources */
702695
ret = -ENOMEM;
703696
cinfo->recv_thread = md_register_thread(recv_daemon, mddev, "cluster_recv");
@@ -749,7 +742,6 @@ static int join(struct mddev *mddev, int nodes)
749742
lockres_free(cinfo->ack_lockres);
750743
lockres_free(cinfo->no_new_dev_lockres);
751744
lockres_free(cinfo->bitmap_lockres);
752-
lockres_free(cinfo->sb_lock);
753745
if (cinfo->lockspace)
754746
dlm_release_lockspace(cinfo->lockspace, 2);
755747
mddev->cluster_info = NULL;
@@ -770,7 +762,6 @@ static int leave(struct mddev *mddev)
770762
lockres_free(cinfo->token_lockres);
771763
lockres_free(cinfo->ack_lockres);
772764
lockres_free(cinfo->no_new_dev_lockres);
773-
lockres_free(cinfo->sb_lock);
774765
lockres_free(cinfo->bitmap_lockres);
775766
dlm_release_lockspace(cinfo->lockspace, 2);
776767
return 0;

0 commit comments

Comments
 (0)