Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux...

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / md / md-cluster.h

diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
index c941726..e75ea26 100644 (file)
--- a/drivers/md/md-cluster.h
+++ b/drivers/md/md-cluster.h
@@ -15,12 +15,12 @@ struct md_cluster_operations {
        int (*resync_info_update)(struct mddev *mddev, sector_t lo, sector_t hi);
        int (*metadata_update_start)(struct mddev *mddev);
        int (*metadata_update_finish)(struct mddev *mddev);
-       int (*metadata_update_cancel)(struct mddev *mddev);
+       void (*metadata_update_cancel)(struct mddev *mddev);
        int (*resync_start)(struct mddev *mddev);
        int (*resync_finish)(struct mddev *mddev);
        int (*area_resyncing)(struct mddev *mddev, int direction, sector_t lo, sector_t hi);
-       int (*add_new_disk_start)(struct mddev *mddev, struct md_rdev *rdev);
-       int (*add_new_disk_finish)(struct mddev *mddev);
+       int (*add_new_disk)(struct mddev *mddev, struct md_rdev *rdev);
+       void (*add_new_disk_cancel)(struct mddev *mddev);
        int (*new_disk_ack)(struct mddev *mddev, bool ack);
        int (*remove_disk)(struct mddev *mddev, struct md_rdev *rdev);
        int (*gather_bitmaps)(struct md_rdev *rdev);