summaryrefslogtreecommitdiffstats
path: root/drivers/md/md-cluster.h
diff options
context:
space:
mode:
authorGoldwyn Rodrigues2015-03-02 17:55:49 +0100
committerNeilBrown2015-03-21 00:33:00 +0100
commitfa8259da0e10b189e41ee60907ec2a499bb66019 (patch)
tree68805b72831656cdcb2d13f3b4c8ee393104e2bd /drivers/md/md-cluster.h
parentmd/bitmap: use sector_div for sector_t divisions (diff)
downloadkernel-qcow2-linux-fa8259da0e10b189e41ee60907ec2a499bb66019.tar.gz
kernel-qcow2-linux-fa8259da0e10b189e41ee60907ec2a499bb66019.tar.xz
kernel-qcow2-linux-fa8259da0e10b189e41ee60907ec2a499bb66019.zip
md: Fix stray --cluster-confirm crash
A --cluster-confirm without an --add (by another node) can crash the kernel. Fix it by guarding it using a state. Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md-cluster.h')
-rw-r--r--drivers/md/md-cluster.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h
index 60d7e58964f5..7417133c4295 100644
--- a/drivers/md/md-cluster.h
+++ b/drivers/md/md-cluster.h
@@ -21,7 +21,7 @@ struct md_cluster_operations {
int (*area_resyncing)(struct mddev *mddev, 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);
- void (*new_disk_ack)(struct mddev *mddev, bool ack);
+ int (*new_disk_ack)(struct mddev *mddev, bool ack);
};
#endif /* _MD_CLUSTER_H */