From 67911fa4b88aedc709a92c1630c1de9ea3a30d1f Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Sat, 18 Mar 2017 22:58:54 +0200 Subject: [PATCH] util/disk_cache: delete .tmp if target exists At the time of target file check, .tmp file is already created and file lock is held, so we should remove the .tmp, like in other error paths. With this, piglit no longer leaves large amount of empty .tmp files behind, which waste directory entries and may interfere with eviction. Signed-off-by: Grazvydas Ignotas Reviewed-by: Timothy Arceri --- src/util/disk_cache.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c index 79ec630..36b27d9 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c @@ -843,8 +843,10 @@ cache_put(void *job, int thread_index) * (to ensure the size accounting of the cache doesn't get off). */ fd_final = open(filename, O_RDONLY | O_CLOEXEC); - if (fd_final != -1) + if (fd_final != -1) { + unlink(filename_tmp); goto done; + } /* OK, we're now on the hook to write out a file that we know is * not in the cache, and is also not being written out to the cache -- 2.7.4