From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 1 Jul 2011 14:17:13 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-3.1/core
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=04bf7869ca0fd12009aee301cac2264a36df4d98;p=linux-edison.git

Merge branch 'for-linus' into for-3.1/core

Conflicts:
	block/blk-throttle.c
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

04bf7869ca0fd12009aee301cac2264a36df4d98
diff --cc fs/partitions/check.c
index 0ead4354943,d545e97d99c..e3c63d1c5e1
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@@ -251,17 -251,11 +251,11 @@@ static ssize_t part_alignment_offset_sh
  	return sprintf(buf, "%llu\n", (unsigned long long)p->alignment_offset);
  }
  
 -ssize_t part_discard_alignment_show(struct device *dev,
 -				   struct device_attribute *attr, char *buf)
 +static 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,