ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lvol: remove page_size field from lvol store struct

Browse Source 
It does not seem nessecary to include it, when this it used just once
in lvol disk creation.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I42ead55329f0ac7e55bb73702d071f118a5c7931
Reviewed-on: https://review.gerrithub.io/379678
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Tomasz Zawadzki 2017-09-19 14:49:30 +02:00 committed by Daniel Verkamp
parent 4912114819
commit dd9fdb0c55
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/spdk_internal/lvolstore.h
View File

@ -68,7 +68,6 @@ struct spdk_lvol_store {
struct spdk_bs_dev *bs_dev; struct spdk_bs_dev *bs_dev;
struct spdk_blob_store *blobstore; struct spdk_blob_store *blobstore;
uuid_t uuid; uuid_t uuid;
uint64_t page_size;
struct spdk_lvs_req *destruct_req; struct spdk_lvs_req *destruct_req;
TAILQ_HEAD(, spdk_lvol) lvols; TAILQ_HEAD(, spdk_lvol) lvols;
}; };

2
lib/bdev/lvol/vbdev_lvol.c
View File

@ -428,7 +428,7 @@ _create_lvol_disk(struct spdk_lvol *lvol)
bdev->name = lvol->name; bdev->name = lvol->name;
bdev->product_name = "Logical Volume"; bdev->product_name = "Logical Volume";
bdev->write_cache = 1; bdev->write_cache = 1;
bdev->blocklen = lvol->lvol_store->page_size; bdev->blocklen = spdk_bs_get_page_size(lvol->lvol_store->blobstore);
assert((lvol->sz % bdev->blocklen) == 0); assert((lvol->sz % bdev->blocklen) == 0);
bdev->blockcnt = lvol->sz / bdev->blocklen; bdev->blockcnt = lvol->sz / bdev->blocklen;

1
lib/lvol/lvol.c
View File

@ -55,7 +55,6 @@ _lvs_init_cb(void *cb_arg, struct spdk_blob_store *bs, int lvserrno)
} else { } else {
assert(bs != NULL); assert(bs != NULL);
lvs->blobstore = bs; lvs->blobstore = bs;
lvs->page_size = spdk_bs_get_page_size(bs);
TAILQ_INIT(&lvs->lvols); TAILQ_INIT(&lvs->lvols);
SPDK_INFOLOG(SPDK_TRACE_LVOL, "Lvol store initialized\n"); SPDK_INFOLOG(SPDK_TRACE_LVOL, "Lvol store initialized\n");

10
test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
View File

@ -36,6 +36,8 @@
#include "vbdev_lvol.c" #include "vbdev_lvol.c"
#define SPDK_BS_PAGE_SIZE 0x1000
int g_lvolerrno; int g_lvolerrno;
int g_lvserrno; int g_lvserrno;
int g_cluster_size; int g_cluster_size;
@ -58,6 +60,12 @@ spdk_bdev_unregister(struct spdk_bdev *bdev)
return; return;
} }
uint64_t
spdk_bs_get_page_size(struct spdk_blob_store *bs)
{
return SPDK_BS_PAGE_SIZE;
}
static void static void
bdev_blob_destroy(struct spdk_bs_dev *bs_dev) bdev_blob_destroy(struct spdk_bs_dev *bs_dev)
{ {
@ -326,7 +334,6 @@ ut_lvol_init(void)
uuid_generate_time(g_lvs->uuid); uuid_generate_time(g_lvs->uuid);
uuid_generate_time(wrong_uuid); uuid_generate_time(wrong_uuid);
g_lvs->page_size = 4096;
/* Incorrect uuid set */ /* Incorrect uuid set */
g_lvolerrno = 0; g_lvolerrno = 0;
@ -368,7 +375,6 @@ ut_lvol_resize(void)
uuid_generate_time(g_lvs->uuid); uuid_generate_time(g_lvs->uuid);
g_lvs->page_size = 4096;
g_base_bdev->blocklen = 4096; g_base_bdev->blocklen = 4096;
TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores); TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores);