From 0dc51fe1ceafe8e68e3591370c9f594e813b6112 Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Fri, 6 May 2011 19:30:02 -0600
Subject: [PATCH] --- yaml --- r: 251144 b: refs/heads/master c:
 23ceb5b7719e9276d4fa72a3ecf94dd396755276 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index db191bcf19a3..95906b38f169 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8af1954d172a46a63e5e79dae523a6d74715e458
+refs/heads/master: 23ceb5b7719e9276d4fa72a3ecf94dd396755276
diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c
index d545e97d99c3..b7e16bccd5e5 100644
--- a/trunk/fs/partitions/check.c
+++ b/trunk/fs/partitions/check.c
@@ -255,7 +255,12 @@ ssize_t part_discard_alignment_show(struct device *dev,
 				   struct device_attribute *attr, char *buf)
 {
 	struct hd_struct *p = dev_to_part(dev);
-	return sprintf(buf, "%u\n", p->discard_alignment);
+	struct gendisk *disk = dev_to_disk(dev);
+
+	return sprintf(buf, "%u\n",
+		       (unsigned long long)queue_limit_discard_alignment(
+							&disk->queue->limits,
+							p->start_sect));
 }
 
 ssize_t part_stat_show(struct device *dev,
@@ -449,8 +454,6 @@ 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 300d7582006e..b78956b3c2e7 100644
--- a/trunk/include/linux/genhd.h
+++ b/trunk/include/linux/genhd.h
@@ -100,7 +100,6 @@ 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;