From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161725Ab2CPHfy (ORCPT ); Fri, 16 Mar 2012 03:35:54 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:50279 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161403Ab2CPHfY (ORCPT ); Fri, 16 Mar 2012 03:35:24 -0400 Message-Id: <20120316073512.573039336@fusionio.com> User-Agent: quilt/0.48-1 Date: Fri, 16 Mar 2012 15:32:16 +0800 From: Shaohua Li To: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org Cc: neilb@suse.de, axboe@kernel.dk, vgoyal@redhat.com, martin.petersen@oracle.com, Shaohua Li Subject: [patch v2 3/6] md: linear supports TRIM References: <20120316073213.656519005@fusionio.com> Content-Disposition: inline; filename=md-linear-discard-support.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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-03-14 09:16:37.380435112 +0800 +++ linux/drivers/md/linear.c 2012-03-14 09:23:55.907261497 +0800 @@ -129,6 +129,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. */ @@ -319,6 +327,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); }