summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKiran Kumar Modukuri <kiran.modukuri@gmail.com>2018-06-21 13:25:53 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-05 09:18:35 +0200
commit9dbea3f6b80638031e4c65285f0b9a60504f1f43 (patch)
tree7389066fcce93830862f6f08c19def5c75e81cb0 /tools
parent06144b250b7a7981a7e60f5614e13777fea8dae7 (diff)
cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
[ Upstream commit c2412ac45a8f8f1cd582723c1a139608694d410d ] If we meet a conflicting object that is marked FSCACHE_OBJECT_IS_LIVE in the active object tree, we have been emitting a BUG after logging information about it and the new object. Instead, we should wait for the CACHEFILES_OBJECT_ACTIVE flag to be cleared on the old object (or return an error). The ACTIVE flag should be cleared after it has been removed from the active object tree. A timeout of 60s is used in the wait, so we shouldn't be able to get stuck there. Fixes: 9ae326a69004 ("CacheFiles: A cache that backs onto a mounted filesystem") Signed-off-by: Kiran Kumar Modukuri <kiran.modukuri@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions