diff options
author | Chris Mason <clm@fb.com> | 2016-01-19 18:21:00 -0800 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2016-01-19 18:21:00 -0800 |
commit | acc308556c812485462b6b43843c3f64530dd843 (patch) | |
tree | fa26745572077d32d446e5fc444eb253812577d1 /fs/btrfs/scrub.c | |
parent | 988f1f576d4f7531cb2175ee1b7cb7afd6d95d22 (diff) | |
parent | fb75d857a31d600cc0c37b8c7d914014f7fa3f9a (diff) | |
download | op-kernel-dev-acc308556c812485462b6b43843c3f64530dd843.zip op-kernel-dev-acc308556c812485462b6b43843c3f64530dd843.tar.gz |
Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 0c981eb..681db07 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -3458,7 +3458,7 @@ static noinline_for_stack int scrub_chunk(struct scrub_ctx *sctx, return ret; } - map = (struct map_lookup *)em->bdev; + map = em->map_lookup; if (em->start != chunk_offset) goto out; |