tree 51b1fc266708d34e0878eaf1e6435773067379a0
parent 5988ce239682854d4e632fb58bff000700830394
author Jens Axboe <jaxboe@fusionio.com> 1306734171 +0200
committer Jens Axboe <jaxboe@fusionio.com> 1306734171 +0200

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