From 1bb5cb3b4a10d7f6281b4957cf14fdda47cb08b3 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Mon, 30 May 2011 07:42:51 +0200
Subject: [PATCH] --- yaml --- r: 253021 b: refs/heads/master c:
 a1706ac4c0201ea0143dc0db0659001b26ceeabb h: refs/heads/master i:   253019:
 7684720645e9e6445010fa055c720e7f6cabc27d v: v3

---
 [refs]                      |  2 +-
 trunk/fs/partitions/check.c | 10 +++-------
 trunk/include/linux/genhd.h |  1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 263c3597139b..154ff57b311e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5988ce239682854d4e632fb58bff000700830394
+refs/heads/master: a1706ac4c0201ea0143dc0db0659001b26ceeabb
diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c
index f82e762eeca2..d545e97d99c3 100644
--- a/trunk/fs/partitions/check.c
+++ b/trunk/fs/partitions/check.c
@@ -255,13 +255,7 @@ ssize_t part_discard_alignment_show(struct device *dev,
 				   struct device_attribute *attr, char *buf)
 {
 	struct hd_struct *p = dev_to_part(dev);
-	struct gendisk *disk = dev_to_disk(dev);
-	unsigned int alignment = 0;
-
-	if (disk->queue)
-		alignment = queue_limit_discard_alignment(&disk->queue->limits,
-								p->start_sect);
-	return sprintf(buf, "%u\n", alignment);
+	return sprintf(buf, "%u\n", p->discard_alignment);
 }
 
 ssize_t part_stat_show(struct device *dev,
@@ -455,6 +449,8 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
 	p->start_sect = start;
 	p->alignment_offset =
 		queue_limit_alignment_offset(&disk->queue->limits, start);
+	p->discard_alignment =
+		queue_limit_discard_alignment(&disk->queue->limits, start);
 	p->nr_sects = len;
 	p->partno = partno;
 	p->policy = get_disk_ro(disk);
diff --git a/trunk/include/linux/genhd.h b/trunk/include/linux/genhd.h
index b78956b3c2e7..300d7582006e 100644
--- a/trunk/include/linux/genhd.h
+++ b/trunk/include/linux/genhd.h
@@ -100,6 +100,7 @@ struct hd_struct {
 	sector_t start_sect;
 	sector_t nr_sects;
 	sector_t alignment_offset;
+	unsigned int discard_alignment;
 	struct device __dev;
 	struct kobject *holder_dir;
 	int policy, partno;