Skip to content

Directly pass sizeof(struct per_bio_data) to dm_per_bio_data #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akiradeveloper merged 1 commit into from
Jan 11, 2025
Merged

Directly pass sizeof(struct per_bio_data) to dm_per_bio_data #271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/dm-writeboost-target.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ struct per_bio_data {
struct segment_header *seg;
};
};
#define per_bio_data(wb, bio) ((struct per_bio_data *)dm_per_bio_data((bio), (wb)->ti->PER_BIO_DATA_SIZE))
#define per_bio_data(bio) ((struct per_bio_data *) dm_per_bio_data((bio), sizeof(struct per_bio_data)))

/*----------------------------------------------------------------------------*/

Expand Down Expand Up @@ -827,7 +827,7 @@ static bool reserve_read_cache_cell(struct wb_device *wb, struct bio *bio)
new_cell->sector = bi_sector(bio);
read_cache_add(cells, new_cell);

pbd = per_bio_data(wb, bio);
pbd = per_bio_data(bio);
pbd->type = PBD_WILL_CACHE;
pbd->cell_idx = cells->cursor;

Expand All @@ -847,7 +847,7 @@ static void might_cancel_read_cache_cell(struct wb_device *wb, struct bio *bio)

static void read_cache_cell_copy_data(struct wb_device *wb, struct bio *bio, unsigned long error)
{
struct per_bio_data *pbd = per_bio_data(wb, bio);
struct per_bio_data *pbd = per_bio_data(bio);
struct read_cache_cells *cells = wb->read_cache_cells;
struct read_cache_cell *cell = cells->array + pbd->cell_idx;

Expand Down Expand Up @@ -1430,7 +1430,7 @@ static int process_read(struct wb_device *wb, struct bio *bio)
return DM_MAPIO_SUBMITTED;
}

pbd = per_bio_data(wb, bio);
pbd = per_bio_data(bio);
pbd->type = PBD_READ_SEG;
pbd->seg = res.found_seg;

Expand Down Expand Up @@ -1458,7 +1458,7 @@ static int writeboost_map(struct dm_target *ti, struct bio *bio)
{
struct wb_device *wb = ti->private;

struct per_bio_data *pbd = per_bio_data(wb, bio);
struct per_bio_data *pbd = per_bio_data(bio);
pbd->type = PBD_NONE;

if (bio_is_barrier(bio))
Expand All @@ -1482,7 +1482,7 @@ static int writeboost_end_io(struct dm_target *ti, struct bio *bio, int error)
#endif
{
struct wb_device *wb = ti->private;
struct per_bio_data *pbd = per_bio_data(wb, bio);
struct per_bio_data *pbd = per_bio_data(bio);

switch (pbd->type) {
case PBD_NONE:
Expand Down