[SRU T][PATCH 6/6] cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
daniel.axtens at canonical.com
Thu Aug 2 04:18:50 UTC 2018
From: Kiran Kumar Modukuri <kiran.modukuri at gmail.com>
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 at gmail.com>
Signed-off-by: David Howells <dhowells at redhat.com>
(cherry picked from commit c2412ac45a8f8f1cd582723c1a139608694d410d)
Signed-off-by: Daniel Axtens <daniel.axtens at canonical.com>
fs/cachefiles/namei.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index beaa2fd6734f..68c2b2ae0ad6 100644
@@ -199,7 +199,6 @@ wait_for_old_object:
printk(KERN_ERR "CacheFiles: Error:"
" Unexpected object collision\n");
More information about the kernel-team