@@ -6557,16 +6557,16 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
static inline void btrfs_end_bioc(struct btrfs_io_context *bioc, struct bio *bio)
{
- bio->bi_private = bioc->private;
bio->bi_end_io = bioc->end_io;
bio_endio(bio);
+ btrfs_bio(bio)->bioc = NULL;
btrfs_put_bioc(bioc);
}
static void btrfs_end_bio(struct bio *bio)
{
- struct btrfs_io_context *bioc = bio->bi_private;
+ struct btrfs_io_context *bioc = btrfs_bio(bio)->bioc;
int is_orig_bio = 0;
if (bio->bi_status) {
@@ -6624,7 +6624,7 @@ static void submit_stripe_bio(struct btrfs_io_context *bioc, struct bio *bio,
{
struct btrfs_fs_info *fs_info = bioc->fs_info;
- bio->bi_private = bioc;
+ btrfs_bio(bio)->bioc = bioc;
btrfs_bio(bio)->device = dev;
bio->bi_end_io = btrfs_end_bio;
bio->bi_iter.bi_sector = physical >> 9;
@@ -6697,7 +6697,6 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
total_devs = bioc->num_stripes;
bioc->orig_bio = first_bio;
- bioc->private = first_bio->bi_private;
bioc->end_io = first_bio->bi_end_io;
bioc->fs_info = fs_info;
atomic_set(&bioc->stripes_pending, bioc->num_stripes);
@@ -311,6 +311,8 @@ struct btrfs_fs_devices {
struct btrfs_bio {
unsigned int mirror_num;
+ struct btrfs_io_context *bioc;
+
/* @device is for stripe IO submission. */
struct btrfs_device *device;
u64 logical;
@@ -367,7 +369,6 @@ struct btrfs_io_context {
u64 map_type; /* get from map_lookup->type */
bio_end_io_t *end_io;
struct bio *orig_bio;
- void *private;
atomic_t error;
int max_errors;
int num_stripes;
Currently we use btrfs_io_context for dual purposes: - As bio->private for mirror based bio submission For those profiles, we assign bio->private to btrfs_io_context and save the old private/endio, and utilize bioc::stripes_pending. - As pure stripe maps for RAID56 For RAID56, btrfs will assemble its own raid_bio for physical submission. In that case, btrfs_io_context only provides stripe mapping, thus no need to utilize things like end_io/private/stripes_pending. To make future members modifications, here we do a small change, by introducing btrfs_bio::bioc pointer. This modification will increase memory usage for btrfs_bio by 8 bytes, but reduces btrfs_io_context by 8 bytes. Overall it's still a net increase as btrfs_bio will be created for each stripe, while btrfs_io_context exists once for all those involved stripes. This memory usage will be reduced by later commits. Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/volumes.c | 7 +++---- fs/btrfs/volumes.h | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-)