d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

blobfs: add some check for req allocation

Browse Source 
Reason:It will be helpful for the debug, and
for some places we need to handle no memory
case.

Change-Id: Id221a856b1f65fe7b946dec246bb53532a29db78
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/419923
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: John Kariuki <John.K.Kariuki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Ziye Yang 2018-07-20 08:47:09 +08:00 committed by Changpeng Liu
parent ee909296b4
commit 0de89b3617
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/blobfs/blobfs.c
View File

@ -832,7 +832,9 @@ spdk_fs_file_stat(struct spdk_filesystem *fs, struct spdk_io_channel *_channel,
int rc;
req = alloc_fs_request(channel);
assert(req != NULL);
if (req == NULL) {
return -ENOMEM;
}
req->args.fs = fs;
req->args.op.stat.name = name;
@ -966,7 +968,9 @@ spdk_fs_create_file(struct spdk_filesystem *fs, struct spdk_io_channel *_channel
SPDK_DEBUGLOG(SPDK_LOG_BLOBFS, "file=%s\n", name);
req = alloc_fs_request(channel);
assert(req != NULL);
if (req == NULL) {
return -ENOMEM;
}
args = &req->args;
args->fs = fs;
@ -1111,7 +1115,9 @@ spdk_fs_open_file(struct spdk_filesystem *fs, struct spdk_io_channel *_channel,
SPDK_DEBUGLOG(SPDK_LOG_BLOBFS, "file=%s\n", name);
req = alloc_fs_request(channel);
assert(req != NULL);
if (req == NULL) {
return -ENOMEM;
}
args = &req->args;
args->fs = fs;
@ -1248,7 +1254,9 @@ spdk_fs_rename_file(struct spdk_filesystem *fs, struct spdk_io_channel *_channel
int rc;
req = alloc_fs_request(channel);
assert(req != NULL);
if (req == NULL) {
return -ENOMEM;
}
args = &req->args;
@ -1355,7 +1363,9 @@ spdk_fs_delete_file(struct spdk_filesystem *fs, struct spdk_io_channel *_channel
int rc;
req = alloc_fs_request(channel);
assert(req != NULL);
if (req == NULL) {
return -ENOMEM;
}
args = &req->args;
args->fs = fs;
@ -1522,6 +1532,7 @@ __read_done(void *ctx, int bserrno)
struct spdk_fs_request *req = ctx;
struct spdk_fs_cb_args *args = &req->args;
assert(req != NULL);
if (args->op.rw.is_read) {
memcpy(args->op.rw.user_buf,
args->op.rw.pin_buf + (args->op.rw.offset & 0xFFF),
@ -2331,11 +2342,19 @@ _file_sync(struct spdk_file *file, struct spdk_fs_channel *channel,
}
sync_req = alloc_fs_request(channel);
assert(sync_req != NULL);
if (!sync_req) {
pthread_spin_unlock(&file->lock);
cb_fn(cb_arg, -ENOMEM);
return;
}
sync_args = &sync_req->args;
flush_req = alloc_fs_request(channel);
assert(flush_req != NULL);
if (!flush_req) {
pthread_spin_unlock(&file->lock);
cb_fn(cb_arg, -ENOMEM);
return;
}
flush_args = &flush_req->args;
sync_args->file = file;
@ -2481,7 +2500,9 @@ spdk_file_close(struct spdk_file *file, struct spdk_io_channel *_channel)
struct spdk_fs_cb_args *args;
req = alloc_fs_request(channel);
assert(req != NULL);
if (req == NULL) {
return -ENOMEM;
}
args = &req->args;