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

blobfs: remove the file without cache buffer from cache list

Browse Source 
Change-Id: Ibf55e6e2966052bb6f5ce68b2eaa2cafa0b6e459
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1794
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Changpeng Liu 2020-04-10 00:55:21 -04:00 committed by Tomasz Zawadzki
parent c41c4c2bab
commit 76d23f6f4c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/blobfs/blobfs.c
View File

@ -2158,6 +2158,16 @@ _add_file_to_cache_pool(void *ctx)
pthread_spin_unlock(&g_caches_lock);
}
static void
_remove_file_from_cache_pool(void *ctx)
{
struct spdk_file *file = ctx;
pthread_spin_lock(&g_caches_lock);
TAILQ_REMOVE(&g_caches, file, cache_tailq);
pthread_spin_unlock(&g_caches_lock);
}
static struct cache_buffer *
cache_insert_buffer(struct spdk_file *file, uint64_t offset)
{
@ -2711,12 +2721,10 @@ spdk_file_read(struct spdk_file *file, struct spdk_fs_thread_ctx *ctx,
BLOBFS_TRACE(file, "read %p offset=%ju length=%ju\n", payload, offset, read_len);
memcpy(payload, &buf->buf[offset - buf->offset], read_len);
if ((offset + read_len) % CACHE_BUFFER_SIZE == 0) {
pthread_spin_lock(&g_caches_lock);
tree_remove_buffer(file->tree, buf);
if (file->tree->present_mask == 0) {
TAILQ_REMOVE(&g_caches, file, cache_tailq);
spdk_thread_send_msg(g_cache_pool_thread, _remove_file_from_cache_pool, file);
}
pthread_spin_unlock(&g_caches_lock);
}
}