btrfs: a few minor stragglers from the integration tree
btrfs: fix memory allocation for integrity check during mount