From: Shaohua Li <shli@fusionio.com>
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 <shli@fusionio.com>
Subject: [patch v2 3/6] md: linear supports TRIM
Date: Fri, 16 Mar 2012 15:32:16 +0800 [thread overview]
Message-ID: <20120316073512.573039336@fusionio.com> (raw)
In-Reply-To: 20120316073213.656519005@fusionio.com
[-- Attachment #1: md-linear-discard-support.patch --]
[-- Type: text/plain, Size: 1621 bytes --]
This makes md linear support TRIM.
Signed-off-by: Shaohua Li <shli@fusionio.com>
---
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);
}
next prev parent reply other threads:[~2012-03-16 7:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-16 7:32 [patch v2 0/6] Add TRIM support for raid linear/0/1/10 Shaohua Li
2012-03-16 7:32 ` [patch v2 1/6] block: makes bio_split support bio without data Shaohua Li
2012-03-16 7:32 ` [patch v2 2/6] blk: dont allow discard request merge temporarily Shaohua Li
2012-03-20 16:21 ` Vivek Goyal
2012-03-21 1:22 ` Shaohua Li
2012-03-21 12:14 ` [patch 1/2]block: handle merged discard request Shaohua Li
2012-03-22 2:32 ` Martin K. Petersen
2012-03-22 2:39 ` Shaohua Li
2012-03-22 2:53 ` Martin K. Petersen
2012-06-20 8:57 ` Christoph Hellwig
2012-06-22 3:46 ` Martin K. Petersen
2012-08-03 2:10 ` Shaohua Li
2012-08-18 3:06 ` Mike Snitzer
2012-08-18 3:47 ` Martin K. Petersen
2012-08-20 13:57 ` Mike Snitzer
2012-08-20 13:58 ` Christoph Hellwig
2012-08-20 14:12 ` Mike Snitzer
2012-08-20 14:15 ` Christoph Hellwig
2012-03-22 2:18 ` [patch v2 2/6] blk: dont allow discard request merge temporarily Martin K. Petersen
2012-03-22 2:33 ` Shaohua Li
2012-03-22 6:28 ` Christoph Hellwig
2012-03-16 7:32 ` Shaohua Li [this message]
2012-03-16 7:32 ` [patch v2 4/6] md: raid 0 supports TRIM Shaohua Li
2012-03-16 7:32 ` [patch v2 5/6] md: raid 1 " Shaohua Li
2012-03-16 7:32 ` [patch v2 6/6] md: raid 10 " Shaohua Li
2012-03-19 19:38 ` [patch v2 0/6] Add TRIM support for raid linear/0/1/10 Holger Kiehl
2012-03-20 1:27 ` Shaohua Li
2012-03-20 9:50 ` Holger Kiehl
2012-03-20 12:09 ` Shaohua Li
2012-03-21 2:08 ` Shaohua Li
2012-03-21 2:24 ` Roberto Spadim
2012-03-21 2:29 ` Mathias Burén
2012-03-21 2:29 ` Mathias Burén
2012-05-08 9:59 ` Patelczyk, Maciej
2012-05-09 2:27 ` Shaohua Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120316073512.573039336@fusionio.com \
--to=shli@fusionio.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=neilb@suse.de \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).