From 8ca6a24f6e59655c35babc8a27fdc0b74f622bdf Mon Sep 17 00:00:00 2001 From: majianpeng Date: Mon, 2 Apr 2012 09:48:37 +1000 Subject: [PATCH] --- yaml --- r: 298546 b: refs/heads/master c: 0366ef847581d692e197b88825867ca9ee00e358 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid0.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f0e8fdaa3ecb..73f9476ca6c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98d5561bfbc3c7a53d6abc1812a2bd5344d36fa3 +refs/heads/master: 0366ef847581d692e197b88825867ca9ee00e358 diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c index 6f31f5596e01..c9809453a346 100644 --- a/trunk/drivers/md/raid0.c +++ b/trunk/drivers/md/raid0.c @@ -407,6 +407,8 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks return array_sectors; } +static int raid0_stop(struct mddev *mddev); + static int raid0_run(struct mddev *mddev) { struct r0conf *conf; @@ -454,7 +456,12 @@ static int raid0_run(struct mddev *mddev) blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec); dump_zones(mddev); - return md_integrity_register(mddev); + + ret = md_integrity_register(mddev); + if (ret) + raid0_stop(mddev); + + return ret; } static int raid0_stop(struct mddev *mddev)