]> git.hungrycats.org Git - linux/commitdiff
Btrfs: fix compilation errors under DEBUG
authorFabian Frederick <fabf@skynet.be>
Wed, 24 Sep 2014 18:23:05 +0000 (20:23 +0200)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 23 Jan 2015 13:14:55 +0000 (08:14 -0500)
bi_sector and bi_size moved to bi_iter since commit 4f024f3797c4
("block: Abstract out bvec iterator")

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Chris Mason <clm@fb.com>
(cherry picked from commit 1b6e44690d2283e49c9e967d6a1739aac8490672)

fs/btrfs/volumes.c

index 5b5a5c47329494ebc91bbf9fcaac726d29cd9afc..d47289c715c814f47c7842349afc942640310238 100644 (file)
@@ -5708,8 +5708,8 @@ static void submit_stripe_bio(struct btrfs_root *root, struct btrfs_bio *bbio,
                name = rcu_dereference(dev->name);
                pr_debug("btrfs_map_bio: rw %d, sector=%llu, dev=%lu "
                         "(%s id %llu), size=%u\n", rw,
-                        (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev,
-                        name->str, dev->devid, bio->bi_size);
+                        (u64)bio->bi_iter.bi_sector, (u_long)dev->bdev->bd_dev,
+                        name->str, dev->devid, bio->bi_iter.bi_size);
                rcu_read_unlock();
        }
 #endif