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

blobfs: use macro instead of hardcoded BLOBFS string

Browse Source 
We used "BLOBFS" as the signature when loading from blobstore, so define
a macro here.

Change-Id: Iff504a36686c2bc08c90c49b8a505b5533b62508
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464850
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Changpeng Liu 2019-08-12 04:05:14 -04:00 committed by Ben Walker
parent 765f4a7363
commit 62202dda32
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/blobfs/blobfs.c
View File

@ -54,6 +54,8 @@
#define BLOBFS_DEFAULT_CACHE_SIZE (4ULL * 1024 * 1024 * 1024) #define BLOBFS_DEFAULT_CACHE_SIZE (4ULL * 1024 * 1024 * 1024)
#define SPDK_BLOBFS_DEFAULT_OPTS_CLUSTER_SZ (1024 * 1024) #define SPDK_BLOBFS_DEFAULT_OPTS_CLUSTER_SZ (1024 * 1024)
#define SPDK_BLOBFS_SIGNATURE "BLOBFS"
static uint64_t g_fs_cache_size = BLOBFS_DEFAULT_CACHE_SIZE; static uint64_t g_fs_cache_size = BLOBFS_DEFAULT_CACHE_SIZE;
static struct spdk_mempool *g_cache_pool; static struct spdk_mempool *g_cache_pool;
static TAILQ_HEAD(, spdk_file) g_caches; static TAILQ_HEAD(, spdk_file) g_caches;
@ -593,7 +595,7 @@ spdk_fs_init(struct spdk_bs_dev *dev, struct spdk_blobfs_opts *opt,
args->fs = fs; args->fs = fs;
spdk_bs_opts_init(&opts); spdk_bs_opts_init(&opts);
snprintf(opts.bstype.bstype, sizeof(opts.bstype.bstype), "BLOBFS"); snprintf(opts.bstype.bstype, sizeof(opts.bstype.bstype), SPDK_BLOBFS_SIGNATURE);
if (opt) { if (opt) {
opts.cluster_sz = opt->cluster_sz; opts.cluster_sz = opt->cluster_sz;
} }
@ -753,7 +755,7 @@ load_cb(void *ctx, struct spdk_blob_store *bs, int bserrno)
struct spdk_fs_cb_args *args = &req->args; struct spdk_fs_cb_args *args = &req->args;
struct spdk_filesystem *fs = args->fs; struct spdk_filesystem *fs = args->fs;
struct spdk_bs_type bstype; struct spdk_bs_type bstype;
static const struct spdk_bs_type blobfs_type = {"BLOBFS"}; static const struct spdk_bs_type blobfs_type = {SPDK_BLOBFS_SIGNATURE};
static const struct spdk_bs_type zeros; static const struct spdk_bs_type zeros;
if (bserrno != 0) { if (bserrno != 0) {