From fc45844cf59d426614b1bc1f73ea008ef5d45326 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 11 Apr 2019 03:08:15 -0400 Subject: [PATCH] blobfs: use wrapper function to free fs resources Change-Id: Ia9c430c512e8c9a3195e2bfb28adb0526174070a Signed-off-by: Changpeng Liu Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450982 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- lib/blobfs/blobfs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/blobfs/blobfs.c b/lib/blobfs/blobfs.c index aaa525423..a040ac89e 100644 --- a/lib/blobfs/blobfs.c +++ b/lib/blobfs/blobfs.c @@ -194,6 +194,8 @@ struct spdk_fs_cb_args { }; static void cache_free_buffers(struct spdk_file *file); +static void spdk_fs_io_device_unregister(struct spdk_filesystem *fs); +static void spdk_fs_free_io_channels(struct spdk_filesystem *fs); void spdk_fs_opts_init(struct spdk_blobfs_opts *opts) @@ -518,12 +520,8 @@ spdk_fs_init(struct spdk_bs_dev *dev, struct spdk_blobfs_opts *opt, req = alloc_fs_request(fs->md_target.md_fs_channel); if (req == NULL) { - spdk_put_io_channel(fs->md_target.md_io_channel); - spdk_io_device_unregister(&fs->md_target, NULL); - spdk_put_io_channel(fs->sync_target.sync_io_channel); - spdk_io_device_unregister(&fs->sync_target, NULL); - spdk_io_device_unregister(&fs->io_target, NULL); - free(fs); + spdk_fs_free_io_channels(fs); + spdk_fs_io_device_unregister(fs); cb_fn(cb_arg, NULL, -ENOMEM); return; }