From: Christoph Hellwig <hch@lst.de>

Patch fixed up and
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>