diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-27 16:26:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-27 16:38:08 +1000 |
| commit | 56cc5661e9c66268b3d14d99c86c9a72ef06e4e1 (patch) | |
| tree | 2fe8dad5d45f029cb3a1d64a049bafd24eb12555 /fs/btrfs/volumes.c | |
| parent | 1e0149933a90b077e24b13f59e28bfff73275e0b (diff) | |
| parent | 0d2456aa34d27f2aaba8ca608e5e60cd56b9e7cd (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 8bffb9174afb..34cb538ecd2e 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5018,7 +5018,8 @@ int btrfs_rmap_block(struct btrfs_mapping_tree *map_tree, return 0; } -static void btrfs_end_bio(struct bio *bio, int err) +static void btrfs_end_bio(struct bio *bio, int err, + struct batch_complete *batch) { struct btrfs_bio *bbio = bio->bi_private; int is_orig_bio = 0; @@ -5073,7 +5074,7 @@ static void btrfs_end_bio(struct bio *bio, int err) } kfree(bbio); - bio_endio(bio, err); + bio_endio_batch(bio, err, batch); } else if (!is_orig_bio) { bio_put(bio); } |