Commit c2412ac4 authored Jun 21, 2018 by Kiran Kumar Modukuri Committed by David Howells Jul 25, 2018

cachefiles: Wait rather than BUG'ing on "Unexpected object collision"

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: 9ae326a6 ("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>

parent 5ce83d4b

fs/cachefiles/namei.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ wait_for_old_object:
		pr_err("\n");
		pr_err("Error: Unexpected object collision\n");
		cachefiles_printk_object(object, xobject);
		BUG();
		}
		atomic_inc(&xobject->usage);
		write_unlock(&cache->active_lock);

Admin message