Orignally from Karen Xie, but merge conflicts/errors fixed up by
Mike Christie.
Signed-off-by: NKaren Xie <kxie@chelsio.com>
Signed-off-by: NMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: NJames Bottomley <James.Bottomley@HansenPartnership.com>