| From foo@baz Sun Aug 26 09:13:00 CEST 2018 |
| From: Kiran Kumar Modukuri <kiran.modukuri@gmail.com> |
| Date: Thu, 21 Jun 2018 13:25:53 -0700 |
| Subject: cachefiles: Wait rather than BUG'ing on "Unexpected object collision" |
| |
| From: Kiran Kumar Modukuri <kiran.modukuri@gmail.com> |
| |
| [ 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> |
| --- |
| fs/cachefiles/namei.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/fs/cachefiles/namei.c |
| +++ b/fs/cachefiles/namei.c |
| @@ -195,7 +195,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); |
