From 8945b482cedb2b8d7abc7c403d2d9adc7a832d6e Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Fri, 16 Sep 2022 18:31:22 +0200 Subject: [PATCH] Remove private parameter from cas_disk_open() Signed-off-by: Robert Baldyga --- modules/cas_cache/disk.c | 4 +--- modules/cas_cache/disk.h | 3 +-- modules/cas_cache/volume/vol_block_dev_bottom.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/cas_cache/disk.c b/modules/cas_cache/disk.c index 75ca842..81b8f5e 100644 --- a/modules/cas_cache/disk.c +++ b/modules/cas_cache/disk.c @@ -96,7 +96,7 @@ static int _cas_disk_init_kobject(struct cas_disk *dsk) return result; } -struct cas_disk *cas_disk_open(const char *path, void *private) +struct cas_disk *cas_disk_open(const char *path) { struct cas_disk *dsk; int result = 0; @@ -127,8 +127,6 @@ struct cas_disk *cas_disk_open(const char *path, void *private) goto error_open_bdev; } - dsk->private = private; - dsk->id = cas_module.next_disk_id++; result = _cas_disk_init_kobject(dsk); diff --git a/modules/cas_cache/disk.h b/modules/cas_cache/disk.h index 475b11a..b554e9d 100644 --- a/modules/cas_cache/disk.h +++ b/modules/cas_cache/disk.h @@ -43,10 +43,9 @@ int cas_disk_allocate_minors(int count); /** * @brief Open block device * @param path Path to block device - * @param private Private data * @return Pointer to cas_disk related to opened block device */ -struct cas_disk *cas_disk_open(const char *path, void *private); +struct cas_disk *cas_disk_open(const char *path); /** * @brief Close block device and remove from cas diff --git a/modules/cas_cache/volume/vol_block_dev_bottom.c b/modules/cas_cache/volume/vol_block_dev_bottom.c index 528dd79..4321d26 100644 --- a/modules/cas_cache/volume/vol_block_dev_bottom.c +++ b/modules/cas_cache/volume/vol_block_dev_bottom.c @@ -35,7 +35,7 @@ int block_dev_open_object(ocf_volume_t vol, void *volume_params) return 0; } - dsk = cas_disk_open(uuid->data, NULL); + dsk = cas_disk_open(uuid->data); if (IS_ERR_OR_NULL(dsk)) { int error = PTR_ERR(dsk) ?: -EINVAL;