diff --git a/common/block.c b/common/block.c index 2cf85ae..ad07f8b 100644 --- a/common/block.c +++ b/common/block.c @@ -387,3 +387,25 @@ return 0; } + +int block_read(struct block_device *blk, void *buf, int block, int num_blocks) +{ + int ret; + + ret = cdev_read(&blk->cdev, buf, + num_blocks << blk->blockbits, + (loff_t)block << blk->blockbits, 0); + + return ret < 0 ? ret : 0; +} + +int block_write(struct block_device *blk, void *buf, int block, int num_blocks) +{ + int ret; + + ret = cdev_write(&blk->cdev, buf, + num_blocks << blk->blockbits, + (loff_t)block << blk->blockbits, 0); + + return ret < 0 ? ret : 0; +} diff --git a/common/partitions.c b/common/partitions.c index 683b258..35a604c 100644 --- a/common/partitions.c +++ b/common/partitions.c @@ -128,7 +128,7 @@ pdesc = xzalloc(sizeof(*pdesc)); buf = dma_alloc(SECTOR_SIZE * 2); - rc = blk->ops->read(blk, buf, 0, 2); + rc = block_read(blk, buf, 0, 2); if (rc != 0) { dev_err(blk->dev, "Cannot read MBR/partition table\n"); goto on_error; diff --git a/common/partitions/efi.c b/common/partitions/efi.c index e450eeb..ee1326e 100644 --- a/common/partitions/efi.c +++ b/common/partitions/efi.c @@ -86,7 +86,7 @@ from = le64_to_cpu(pgpt_head->partition_entry_lba); size = count / GPT_BLOCK_SIZE; - ret = blk->ops->read(blk, pte, from, size); + ret = block_read(blk, pte, from, size); if (ret) { kfree(pte); pte=NULL; @@ -121,7 +121,7 @@ if (!gpt) return NULL; - ret = blk->ops->read(blk, gpt, lba, 1); + ret = block_read(blk, gpt, lba, 1); if (ret) { kfree(gpt); gpt=NULL; diff --git a/include/block.h b/include/block.h index ef36f58..eb31aca 100644 --- a/include/block.h +++ b/include/block.h @@ -29,4 +29,12 @@ int blockdevice_register(struct block_device *blk); int blockdevice_unregister(struct block_device *blk); +int block_read(struct block_device *blk, void *buf, int block, int num_blocks); +int block_write(struct block_device *blk, void *buf, int block, int num_blocks); + +static inline int block_flush(struct block_device *blk) +{ + return cdev_flush(&blk->cdev); +} + #endif /* __BLOCK_H */