diff --git a/[refs] b/[refs] index 29a9420d27e6..8dfc2570d8e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21ca543efc12674fddb22ddf4ea4906427f4e982 +refs/heads/master: 56d2a48f81a1bde827c625b90221fade72fe9c61 diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c index 562dad10dee9..ed11d3866afd 100644 --- a/trunk/fs/btrfs/scrub.c +++ b/trunk/fs/btrfs/scrub.c @@ -655,6 +655,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix) "scrub_fixup: btrfs_map_block failed us for %llu\n", (unsigned long long)logical); WARN_ON(1); + kfree(bbio); return; }