diff options
Diffstat (limited to 'drivers/md/linear.c')
-rw-r--r-- | drivers/md/linear.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index df6f2c98eca7..5f1eb9189542 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
@@ -245,7 +245,7 @@ static void linear_free(struct mddev *mddev, void *priv) | |||
245 | kfree(conf); | 245 | kfree(conf); |
246 | } | 246 | } |
247 | 247 | ||
248 | static void linear_make_request(struct mddev *mddev, struct bio *bio) | 248 | static bool linear_make_request(struct mddev *mddev, struct bio *bio) |
249 | { | 249 | { |
250 | char b[BDEVNAME_SIZE]; | 250 | char b[BDEVNAME_SIZE]; |
251 | struct dev_info *tmp_dev; | 251 | struct dev_info *tmp_dev; |
@@ -254,7 +254,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) | |||
254 | 254 | ||
255 | if (unlikely(bio->bi_opf & REQ_PREFLUSH)) { | 255 | if (unlikely(bio->bi_opf & REQ_PREFLUSH)) { |
256 | md_flush_request(mddev, bio); | 256 | md_flush_request(mddev, bio); |
257 | return; | 257 | return true; |
258 | } | 258 | } |
259 | 259 | ||
260 | tmp_dev = which_dev(mddev, bio_sector); | 260 | tmp_dev = which_dev(mddev, bio_sector); |
@@ -292,7 +292,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) | |||
292 | mddev_check_write_zeroes(mddev, bio); | 292 | mddev_check_write_zeroes(mddev, bio); |
293 | generic_make_request(bio); | 293 | generic_make_request(bio); |
294 | } | 294 | } |
295 | return; | 295 | return true; |
296 | 296 | ||
297 | out_of_bounds: | 297 | out_of_bounds: |
298 | pr_err("md/linear:%s: make_request: Sector %llu out of bounds on dev %s: %llu sectors, offset %llu\n", | 298 | pr_err("md/linear:%s: make_request: Sector %llu out of bounds on dev %s: %llu sectors, offset %llu\n", |
@@ -302,6 +302,7 @@ out_of_bounds: | |||
302 | (unsigned long long)tmp_dev->rdev->sectors, | 302 | (unsigned long long)tmp_dev->rdev->sectors, |
303 | (unsigned long long)start_sector); | 303 | (unsigned long long)start_sector); |
304 | bio_io_error(bio); | 304 | bio_io_error(bio); |
305 | return true; | ||
305 | } | 306 | } |
306 | 307 | ||
307 | static void linear_status (struct seq_file *seq, struct mddev *mddev) | 308 | static void linear_status (struct seq_file *seq, struct mddev *mddev) |