github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move private field to struct cas_exp_obj

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
Robert Baldyga 2022-09-16 22:22:18 +02:00
parent dc390adf49
commit 61dff1f6fd
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cas_cache/disk.h
View File

@ -19,8 +19,6 @@ struct cas_disk {
struct block_device *bd; struct block_device *bd;
struct cas_exp_obj *exp_obj; struct cas_exp_obj *exp_obj;
void *private;
}; };
int __init cas_init_disks(void); int __init cas_init_disks(void);

10
modules/cas_cache/exp_obj.c
View File

@ -64,11 +64,13 @@ void cas_deinit_exp_objs(void)
static MAKE_RQ_RET_TYPE _cas_exp_obj_submit_bio(struct bio *bio) static MAKE_RQ_RET_TYPE _cas_exp_obj_submit_bio(struct bio *bio)
{ {
struct cas_disk *dsk; struct cas_disk *dsk;
struct cas_exp_obj *exp_obj;
BUG_ON(!bio); BUG_ON(!bio);
dsk = CAS_BIO_GET_GENDISK(bio)->private_data; dsk = CAS_BIO_GET_GENDISK(bio)->private_data;
exp_obj = dsk->exp_obj;
dsk->exp_obj->ops->submit_bio(dsk, bio, dsk->private); exp_obj->ops->submit_bio(dsk, bio, exp_obj->private);
KRETURN(0); KRETURN(0);
} }
@ -410,7 +412,7 @@ int cas_exp_obj_create(struct cas_disk *dsk, const char *dev_name,
queue->queuedata = dsk; queue->queuedata = dsk;
exp_obj->queue = queue; exp_obj->queue = queue;
dsk->private = priv; exp_obj->private = priv;
_cas_init_queues(dsk); _cas_init_queues(dsk);
@ -421,7 +423,7 @@ int cas_exp_obj_create(struct cas_disk *dsk, const char *dev_name,
cas_blk_queue_make_request(queue, _cas_exp_obj_make_rq_fn); cas_blk_queue_make_request(queue, _cas_exp_obj_make_rq_fn);
if (exp_obj->ops->set_geometry) { if (exp_obj->ops->set_geometry) {
result = exp_obj->ops->set_geometry(dsk, dsk->private); result = exp_obj->ops->set_geometry(dsk, exp_obj->private);
if (result) if (result)
goto error_set_geometry; goto error_set_geometry;
} }
@ -429,7 +431,7 @@ int cas_exp_obj_create(struct cas_disk *dsk, const char *dev_name,
return 0; return 0;
error_set_geometry: error_set_geometry:
dsk->private = NULL; exp_obj->private = NULL;
_cas_exp_obj_clear_dev_t(dsk); _cas_exp_obj_clear_dev_t(dsk);
error_exp_obj_set_dev_t: error_exp_obj_set_dev_t:
cas_cleanup_mq_disk(exp_obj); cas_cleanup_mq_disk(exp_obj);

2
modules/cas_cache/exp_obj.h
View File

@ -50,6 +50,8 @@ struct cas_exp_obj {
atomic_t pt_ios; atomic_t pt_ios;
atomic_t *pending_rqs; atomic_t *pending_rqs;
void *private;
}; };
int __init cas_init_exp_objs(void); int __init cas_init_exp_objs(void);