Skip to content

Commit 0fcb100

Browse files
nhukcMike Snitzer
authored andcommitted
dm bufio: Add flags argument to dm_bufio_client_create
Add a flags argument to dm_bufio_client_create and update all the callers. This is in preparation to add the DM_BUFIO_NO_SLEEP flag. Signed-off-by: Nathan Huckleberry <[email protected]> Signed-off-by: Mike Snitzer <[email protected]>
1 parent 9dd1cd3 commit 0fcb100

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

drivers/md/dm-bufio.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,8 @@ static unsigned long dm_bufio_shrink_count(struct shrinker *shrink, struct shrin
17171717
struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsigned block_size,
17181718
unsigned reserved_buffers, unsigned aux_size,
17191719
void (*alloc_callback)(struct dm_buffer *),
1720-
void (*write_callback)(struct dm_buffer *))
1720+
void (*write_callback)(struct dm_buffer *),
1721+
unsigned int flags)
17211722
{
17221723
int r;
17231724
struct dm_bufio_client *c;

drivers/md/dm-ebs-target.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ static int ebs_ctr(struct dm_target *ti, unsigned int argc, char **argv)
312312
goto bad;
313313
}
314314

315-
ec->bufio = dm_bufio_client_create(ec->dev->bdev, to_bytes(ec->u_bs), 1, 0, NULL, NULL);
315+
ec->bufio = dm_bufio_client_create(ec->dev->bdev, to_bytes(ec->u_bs), 1,
316+
0, NULL, NULL, 0);
316317
if (IS_ERR(ec->bufio)) {
317318
ti->error = "Cannot create dm bufio client";
318319
r = PTR_ERR(ec->bufio);

drivers/md/dm-integrity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4439,7 +4439,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
44394439
}
44404440

44414441
ic->bufio = dm_bufio_client_create(ic->meta_dev ? ic->meta_dev->bdev : ic->dev->bdev,
4442-
1U << (SECTOR_SHIFT + ic->log2_buffer_sectors), 1, 0, NULL, NULL);
4442+
1U << (SECTOR_SHIFT + ic->log2_buffer_sectors), 1, 0, NULL, NULL, 0);
44434443
if (IS_ERR(ic->bufio)) {
44444444
r = PTR_ERR(ic->bufio);
44454445
ti->error = "Cannot initialize dm-bufio";

drivers/md/dm-snap-persistent.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ static int read_exceptions(struct pstore *ps,
494494

495495
client = dm_bufio_client_create(dm_snap_cow(ps->store->snap)->bdev,
496496
ps->store->chunk_size << SECTOR_SHIFT,
497-
1, 0, NULL, NULL);
497+
1, 0, NULL, NULL, 0);
498498

499499
if (IS_ERR(client))
500500
return PTR_ERR(client);

drivers/md/dm-verity-fec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ int verity_fec_ctr(struct dm_verity *v)
749749

750750
f->bufio = dm_bufio_client_create(f->dev->bdev,
751751
f->io_size,
752-
1, 0, NULL, NULL);
752+
1, 0, NULL, NULL, 0);
753753
if (IS_ERR(f->bufio)) {
754754
ti->error = "Cannot initialize FEC bufio client";
755755
return PTR_ERR(f->bufio);
@@ -765,7 +765,7 @@ int verity_fec_ctr(struct dm_verity *v)
765765

766766
f->data_bufio = dm_bufio_client_create(v->data_dev->bdev,
767767
1 << v->data_dev_block_bits,
768-
1, 0, NULL, NULL);
768+
1, 0, NULL, NULL, 0);
769769
if (IS_ERR(f->data_bufio)) {
770770
ti->error = "Cannot initialize FEC data bufio client";
771771
return PTR_ERR(f->data_bufio);

drivers/md/dm-verity-target.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
12651265

12661266
v->bufio = dm_bufio_client_create(v->hash_dev->bdev,
12671267
1 << v->hash_dev_block_bits, 1, sizeof(struct buffer_aux),
1268-
dm_bufio_alloc_callback, NULL);
1268+
dm_bufio_alloc_callback, NULL, 0);
12691269
if (IS_ERR(v->bufio)) {
12701270
ti->error = "Cannot initialize dm-bufio";
12711271
r = PTR_ERR(v->bufio);

drivers/md/persistent-data/dm-block-manager.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,8 @@ struct dm_block_manager *dm_block_manager_create(struct block_device *bdev,
391391
bm->bufio = dm_bufio_client_create(bdev, block_size, max_held_per_thread,
392392
sizeof(struct buffer_aux),
393393
dm_block_manager_alloc_callback,
394-
dm_block_manager_write_callback);
394+
dm_block_manager_write_callback,
395+
0);
395396
if (IS_ERR(bm->bufio)) {
396397
r = PTR_ERR(bm->bufio);
397398
kfree(bm);

include/linux/dm-bufio.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ struct dm_bufio_client *
2424
dm_bufio_client_create(struct block_device *bdev, unsigned block_size,
2525
unsigned reserved_buffers, unsigned aux_size,
2626
void (*alloc_callback)(struct dm_buffer *),
27-
void (*write_callback)(struct dm_buffer *));
27+
void (*write_callback)(struct dm_buffer *),
28+
unsigned int flags);
2829

2930
/*
3031
* Release a buffered IO cache.

0 commit comments

Comments
 (0)