From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shaohua Li Subject: [patch 2/7 v2] md: linear supports TRIM Date: Fri, 10 Aug 2012 10:51:15 +0800 Message-ID: <20120810025217.337699152@kernel.org> References: <20120810025113.050392766@kernel.org> Return-path: Content-Disposition: inline; filename=md-linear-discard-support.patch Sender: linux-raid-owner@vger.kernel.org To: linux-raid@vger.kernel.org Cc: neilb@suse.de, axboe@kernel.dk, shli@kernel.org List-Id: linux-raid.ids This makes md linear support TRIM. Signed-off-by: Shaohua Li --- drivers/md/linear.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) Index: linux/drivers/md/linear.c =================================================================== --- linux.orig/drivers/md/linear.c 2012-06-06 09:35:56.478255641 +0800 +++ linux/drivers/md/linear.c 2012-08-10 07:08:52.816281828 +0800 @@ -138,6 +138,7 @@ static struct linear_conf *linear_conf(s struct linear_conf *conf; struct md_rdev *rdev; int i, cnt; + bool discard_supported = false; conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(struct dev_info), GFP_KERNEL); @@ -171,6 +172,8 @@ static struct linear_conf *linear_conf(s conf->array_sectors += rdev->sectors; cnt++; + if (blk_queue_discard(bdev_get_queue(rdev->bdev))) + discard_supported = true; } if (cnt != raid_disks) { printk(KERN_ERR "md/linear:%s: not enough drives present. Aborting!\n", @@ -178,6 +181,11 @@ static struct linear_conf *linear_conf(s goto out; } + if (!discard_supported) + queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); + else + queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); + /* * Here we calculate the device offsets. */ @@ -326,6 +334,14 @@ static void linear_make_request(struct m bio->bi_sector = bio->bi_sector - start_sector + tmp_dev->rdev->data_offset; rcu_read_unlock(); + + if (unlikely((bio->bi_rw & REQ_DISCARD) && + !blk_queue_discard(bdev_get_queue(bio->bi_bdev)))) { + /* Just ignore it */ + bio_endio(bio, 0); + return; + } + generic_make_request(bio); }