Changes are from Maciej W. Rozycki and not nicely splitup because it's
the changes to make it work with 2.6 again.  Cosmetic changes by me
to avoid obsolete typedefs.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>