From: Christoph Hellwig <hch@lst.de>

Also reapplied sparse fixes on top of the initial
patch.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>