MD: ignore discard request for hard disks of hybid raid1/raid10 array
PATCH 1/1 MD: ignore discard request for hard disks of hybid raid1/raid10 array
In SSD/hard disk hybid storage, discard request should be ignored for hard disk. We used to be doing this way, but the unplug path forgets it.
This is suitable for stable tree since v3.6.
Reported-and-tested-by Markus <[email protected]>
Signed-off-by Shaohua Li <[email protected]>
--- drivers/md/raid1.c | 7 ++++++- drivers/md/raid10.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/md/raid1.c +6 -1
@@ -981,7 +981,12 @@ static void raid1_unplug(struct blk_plugwhile (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; bio->bi_next =NULL ; -generic_make_request (bio); +if (unlikely ((bio->bi_rw &REQ_DISCARD ) && + !blk_queue_discard (bdev_get_queue (bio->bi_bdev)))) +/* Just ignore it */ +bio_endio (bio,0 ); +else +generic_make_request (bio); bio = next; }kfree (plug);
drivers/md/raid10.c +6 -1
@@ -1133,7 +1133,12 @@ static void raid10_unplug(struct blk_pluwhile (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; bio->bi_next =NULL ; -generic_make_request (bio); +if (unlikely ((bio->bi_rw &REQ_DISCARD ) && + !blk_queue_discard (bdev_get_queue (bio->bi_bdev)))) +/* Just ignore it */ +bio_endio (bio,0 ); +else +generic_make_request (bio); bio = next; }kfree (plug);
NeilBrown
AppliedQuoted 38 lines · On Sun, 28 Apr 2013 18:26:38 +0800 Shaohua Li <[email protected]> wrote:
In SSD/hard disk hybid storage, discard request should be ignored for hard disk. We used to be doing this way, but the unplug path forgets it.
This is suitable for stable tree since v3.6.
Reported-and-tested-by Markus <[email protected]>Signed-off-by Shaohua Li <[email protected]>--- drivers/md/raid1.c | 7 ++++++- drivers/md/raid10.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)Index:
linux/drivers/md/raid1.c
===================================================================drivers/md/raid1.c +6
-1@@ -981,7 +981,12 @@ static void raid1_unplug(struct blk_plugwhile (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; bio->bi_next =NULL ; -generic_make_request (bio); +if (unlikely ((bio->bi_rw &REQ_DISCARD ) && + !blk_queue_discard (bdev_get_queue (bio->bi_bdev)))) +/* Just ignore it */ +bio_endio (bio,0 ); +else +generic_make_request (bio); bio = next; }kfree (plug);Index:
linux/drivers/md/raid10.c
===================================================================drivers/md/raid10.c +0
-0@@ -1133,7 +1133,12 @@ static void raid10_unplug(struct blk_pluwhile (bio) {/* submit pending writes */ struct bio *next = bio->bi_next; bio->bi_next =NULL ;
drivers/md/raid10.c static void raid10_unplug(struct blk_plu · line 1144
Quoted 10 lines
drivers/md/raid10.c +6
-1-generic_make_request (bio); +if (unlikely ((bio->bi_rw &REQ_DISCARD ) && + !blk_queue_discard (bdev_get_queue (bio->bi_bdev)))) +/* Just ignore it */ +bio_endio (bio,0 ); +else +generic_make_request (bio); bio = next; }kfree (plug);
Applied, thanks.
NeilBrown