Skip to content

Commit 5869b09

Browse files
ashwin-simplyblockashwin-simplyblock
committed
use regular lvol create function with priority added
1 parent e498a76 commit 5869b09

File tree

5 files changed

+19
-47
lines changed

5 files changed

+19
-47
lines changed

‎module/bdev/lvol/vbdev_lvol.c

+2-25
Original file line numberDiff line numberDiff line change
@@ -1204,36 +1204,13 @@ _vbdev_lvol_create_cb(void *cb_arg, struct spdk_lvol *lvol, int lvolerrno)
12041204

12051205
int
12061206
vbdev_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
1207-
bool thin_provision, enum lvol_clear_method clear_method, spdk_lvol_op_with_handle_complete cb_fn,
1207+
bool thin_provision, enum lvol_clear_method clear_method, int8_t lvol_priority_class,
1208+
spdk_lvol_op_with_handle_complete cb_fn,
12081209
void *cb_arg)
12091210
{
12101211
struct spdk_lvol_with_handle_req *req;
12111212
int rc;
12121213

1213-
req = calloc(1, sizeof(*req));
1214-
if (req == NULL) {
1215-
return -ENOMEM;
1216-
}
1217-
req->cb_fn = cb_fn;
1218-
req->cb_arg = cb_arg;
1219-
1220-
rc = spdk_lvol_create(lvs, name, sz, thin_provision, clear_method,
1221-
_vbdev_lvol_create_cb, req);
1222-
if (rc != 0) {
1223-
free(req);
1224-
}
1225-
1226-
return rc;
1227-
}
1228-
1229-
int
1230-
vbdev_lvol_create_with_priority_class(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
1231-
bool thin_provision, enum lvol_clear_method clear_method, int lvol_priority_class,
1232-
spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg)
1233-
{
1234-
struct spdk_lvol_with_handle_req *req;
1235-
int rc;
1236-
12371214
req = calloc(1, sizeof(*req));
12381215
if (req == NULL) {
12391216
return -ENOMEM;

‎module/bdev/lvol/vbdev_lvol.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,10 @@ void vbdev_lvs_unload(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, v
3737

3838
int vbdev_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
3939
bool thin_provisioned, enum lvol_clear_method clear_method,
40+
int8_t lvol_priority_class,
4041
spdk_lvol_op_with_handle_complete cb_fn,
4142
void *cb_arg);
42-
43-
int vbdev_lvol_create_with_priority_class(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
44-
bool thin_provisioned, enum lvol_clear_method clear_method,
45-
int lvol_priority_class,
46-
spdk_lvol_op_with_handle_complete cb_fn,
47-
void *cb_arg);
48-
43+
4944
void vbdev_lvol_create_snapshot(struct spdk_lvol *lvol, const char *snapshot_name,
5045
spdk_lvol_op_with_handle_complete cb_fn, void *cb_arg);
5146

‎module/bdev/lvol/vbdev_lvol_rpc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ rpc_bdev_lvol_create(struct spdk_jsonrpc_request *request,
376376
goto cleanup;
377377
}
378378

379-
rc = vbdev_lvol_create_with_priority_class(lvs, req.lvol_name, req.size_in_mib * 1024 * 1024,
379+
rc = vbdev_lvol_create(lvs, req.lvol_name, req.size_in_mib * 1024 * 1024,
380380
req.thin_provision, clear_method, req.lvol_priority_class, rpc_bdev_lvol_create_cb, request);
381381
if (rc < 0) {
382382
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));

‎test/lvol/esnap/esnap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ late_delete(void)
705705
lvs = owh_data.u.lvs;
706706

707707
/* Create an lvol */
708-
vbdev_lvol_create(lvs, "lvol", 1, true, LVOL_CLEAR_WITH_DEFAULT,
708+
vbdev_lvol_create(lvs, "lvol", 1, true, LVOL_CLEAR_WITH_DEFAULT, 0,
709709
lvol_op_with_handle_cb, clear_owh(&owh_data));
710710
poll_error_updated(&owh_data.lvserrno);
711711
CU_ASSERT(owh_data.lvserrno == 0);

‎test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ ut_lvs_destroy(void)
10051005

10061006
/* Successfully create lvol, which should be unloaded with lvs later */
10071007
g_lvolerrno = -1;
1008-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1008+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
10091009
NULL);
10101010
CU_ASSERT(rc == 0);
10111011
CU_ASSERT(g_lvolerrno == 0);
@@ -1042,7 +1042,7 @@ ut_lvol_init(void)
10421042

10431043
/* Successful lvol create */
10441044
g_lvolerrno = -1;
1045-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1045+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
10461046
NULL);
10471047
SPDK_CU_ASSERT_FATAL(rc == 0);
10481048
CU_ASSERT(g_lvol != NULL);
@@ -1079,7 +1079,7 @@ ut_lvol_snapshot(void)
10791079

10801080
/* Successful lvol create */
10811081
g_lvolerrno = -1;
1082-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1082+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
10831083
NULL);
10841084
SPDK_CU_ASSERT_FATAL(rc == 0);
10851085
SPDK_CU_ASSERT_FATAL(g_lvol != NULL);
@@ -1129,7 +1129,7 @@ ut_lvol_clone(void)
11291129

11301130
/* Successful lvol create */
11311131
g_lvolerrno = -1;
1132-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1132+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
11331133
NULL);
11341134
SPDK_CU_ASSERT_FATAL(rc == 0);
11351135
SPDK_CU_ASSERT_FATAL(g_lvol != NULL);
@@ -1332,15 +1332,15 @@ ut_lvol_rename(void)
13321332

13331333
/* Successful lvols create */
13341334
g_lvolerrno = -1;
1335-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1335+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
13361336
NULL);
13371337
SPDK_CU_ASSERT_FATAL(rc == 0);
13381338
CU_ASSERT(g_lvol != NULL);
13391339
CU_ASSERT(g_lvolerrno == 0);
13401340
lvol = g_lvol;
13411341

13421342
g_lvolerrno = -1;
1343-
rc = vbdev_lvol_create(lvs, "lvol2", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1343+
rc = vbdev_lvol_create(lvs, "lvol2", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
13441344
NULL);
13451345
SPDK_CU_ASSERT_FATAL(rc == 0);
13461346
CU_ASSERT(g_lvol != NULL);
@@ -1419,14 +1419,14 @@ ut_bdev_finish(void)
14191419
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
14201420
lvs = g_lvol_store;
14211421

1422-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT,
1422+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0,
14231423
vbdev_lvol_create_complete, NULL);
14241424
SPDK_CU_ASSERT_FATAL(rc == 0);
14251425
CU_ASSERT(g_lvol != NULL);
14261426
CU_ASSERT(g_lvolerrno == 0);
14271427
lvol = g_lvol;
14281428

1429-
rc = vbdev_lvol_create(lvs, "lvol2", sz, false, LVOL_CLEAR_WITH_DEFAULT,
1429+
rc = vbdev_lvol_create(lvs, "lvol2", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0,
14301430
vbdev_lvol_create_complete, NULL);
14311431
SPDK_CU_ASSERT_FATAL(rc == 0);
14321432
CU_ASSERT(g_lvol != NULL);
@@ -1470,7 +1470,7 @@ ut_lvol_resize(void)
14701470

14711471
/* Successful lvol create */
14721472
g_lvolerrno = -1;
1473-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1473+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
14741474
NULL);
14751475
CU_ASSERT(rc == 0);
14761476
CU_ASSERT(g_lvolerrno == 0);
@@ -1518,7 +1518,7 @@ ut_lvol_set_read_only(void)
15181518

15191519
/* Successful lvol create */
15201520
g_lvolerrno = -1;
1521-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1521+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
15221522
NULL);
15231523
CU_ASSERT(rc == 0);
15241524
CU_ASSERT(g_lvolerrno == 0);
@@ -1562,7 +1562,7 @@ ut_lvs_unload(void)
15621562

15631563
/* Successfully create lvol, which should be destroyed with lvs later */
15641564
g_lvolerrno = -1;
1565-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1565+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
15661566
NULL);
15671567
CU_ASSERT(rc == 0);
15681568
CU_ASSERT(g_lvolerrno == 0);
@@ -1783,7 +1783,7 @@ ut_lvs_rename(void)
17831783

17841784
/* Successfully create lvol, which should be destroyed with lvs later */
17851785
g_lvolerrno = -1;
1786-
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, vbdev_lvol_create_complete,
1786+
rc = vbdev_lvol_create(lvs, "lvol", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0, vbdev_lvol_create_complete,
17871787
NULL);
17881788
CU_ASSERT(rc == 0);
17891789
CU_ASSERT(g_lvolerrno == 0);
@@ -2008,7 +2008,7 @@ ut_lvol_shallow_copy(void)
20082008

20092009
/* Successful lvol create */
20102010
g_lvolerrno = -1;
2011-
rc = vbdev_lvol_create(lvs, "lvol_sc", sz, false, LVOL_CLEAR_WITH_DEFAULT,
2011+
rc = vbdev_lvol_create(lvs, "lvol_sc", sz, false, LVOL_CLEAR_WITH_DEFAULT, 0,
20122012
vbdev_lvol_create_complete,
20132013
NULL);
20142014
SPDK_CU_ASSERT_FATAL(rc == 0);

0 commit comments

Comments
 (0)