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

blobfs: cache_insert_buffer() - check count before allocating buffer

Browse Source 
This avoids corner case where a buffer gets allocated on the 100th
try.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: If65053d539d458d9a53c8850bbb4cbe4ee84f604
This commit is contained in:
Jim Harris 2017-03-24 15:02:04 -07:00 committed by Daniel Verkamp
parent 7079a18f21
commit 38f91be52b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/blobfs/blobfs.c
View File

@ -1496,18 +1496,20 @@ cache_insert_buffer(struct spdk_file *file, uint64_t offset)
buf->buf = alloc_cache_memory_buffer(file); buf->buf = alloc_cache_memory_buffer(file);
if (buf->buf == NULL) { if (buf->buf == NULL) {
while (buf->buf == NULL) { while (buf->buf == NULL) {
count++;
buf->buf = alloc_cache_memory_buffer(file);
/* /*
* TODO: __free_oldest_cache() should eventually free some buffers. * TODO: alloc_cache_memory_buffer() should eventually free
* Should have a more sophisticated check here, instead of just * some buffers. Need a more sophisticated check here, instead
* bailing if 100 tries does not result in getting a free buffer. * of just bailing if 100 tries does not result in getting a
* free buffer. This will involve using the sync channel's
* semaphore to block until a buffer becomes available.
*/ */
if (count == 100) { if (count++ == 100) {
SPDK_ERRLOG("could not allocate cache buffer\n"); SPDK_ERRLOG("could not allocate cache buffer\n");
assert(false); assert(false);
free(buf);
return NULL; return NULL;
} }
buf->buf = alloc_cache_memory_buffer(file);
} }
} }