From: Jens Axboe <jaxboe@fusionio.com>
Date: Mon, 30 May 2011 05:42:51 +0000 (+0200)
Subject: Revert "block: Remove extra discard_alignment from hd_struct."
X-Git-Tag: v3.0-rc2~8^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1706ac4c0201ea0143dc0db0659001b26ceeabb;p=pandora-kernel.git

Revert "block: Remove extra discard_alignment from hd_struct."

It was not a good idea to start dereferencing disk->queue from
the fs sysfs strategy for displaying discard alignment. We ran
into first a NULL pointer deref, and after fixing that we sometimes
see unvalid disk->queue pointer values.

Since discard is the only one of the bunch actually looking into
the queue, just revert the change.

This reverts commit 23ceb5b7719e9276d4fa72a3ecf94dd396755276.

Conflicts:
	fs/partitions/check.c
---

Reading git-diff-tree failed