Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / md / md-cluster.c

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index f42162c49e3bdc0a6bde8c4d36456294e6b77e3d..d6a1126d85ce1b9f5f528214a89af7a090647a1b 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -54,7 +54,6 @@ struct md_cluster_info {
        dlm_lockspace_t *lockspace;
        int slot_number;
        struct completion completion;
-       struct mutex sb_mutex;
        struct dlm_lock_resource *bitmap_lockres;
        struct dlm_lock_resource *resync_lockres;
        struct list_head suspend_list;
@@ -94,7 +93,7 @@ static void sync_ast(void *arg)
 {
        struct dlm_lock_resource *res;
 
-       res = (struct dlm_lock_resource *) arg;
+       res = arg;
        complete(&res->completion);
 }
 
@@ -196,8 +195,8 @@ retry:
        kfree(res);
 }
 
-static void add_resync_info(struct mddev *mddev, struct dlm_lock_resource *lockres,
-               sector_t lo, sector_t hi)
+static void add_resync_info(struct dlm_lock_resource *lockres,
+                           sector_t lo, sector_t hi)
 {
        struct resync_info *ri;
 
@@ -350,7 +349,7 @@ static const struct dlm_lockspace_ops md_ls_ops = {
  */
 static void ack_bast(void *arg, int mode)
 {
-       struct dlm_lock_resource *res = (struct dlm_lock_resource *)arg;
+       struct dlm_lock_resource *res = arg;
        struct md_cluster_info *cinfo = res->mddev->cluster_info;
 
        if (mode == DLM_LOCK_EX)
@@ -709,7 +708,6 @@ static int join(struct mddev *mddev, int nodes)
        init_completion(&cinfo->completion);
        set_bit(MD_CLUSTER_BEGIN_JOIN_CLUSTER, &cinfo->state);
 
-       mutex_init(&cinfo->sb_mutex);
        mddev->cluster_info = cinfo;
 
        memset(str, 0, 64);
@@ -886,7 +884,7 @@ static int resync_info_update(struct mddev *mddev, sector_t lo, sector_t hi)
        struct md_cluster_info *cinfo = mddev->cluster_info;
        struct cluster_msg cmsg = {0};
 
-       add_resync_info(mddev, cinfo->bitmap_lockres, lo, hi);
+       add_resync_info(cinfo->bitmap_lockres, lo, hi);
        /* Re-acquire the lock to refresh LVB */
        dlm_lock_sync(cinfo->bitmap_lockres, DLM_LOCK_PW);
        cmsg.type = cpu_to_le32(RESYNCING);