This also fixes a number of sparse warnings.
Signed-off-by: NDaniel Mack <zonque@gmail.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: J. Bruce Fields <bfields@fieldses.org>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>