Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / fs / cachefiles / namei.c

diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index dad7d9542a24bc287e94567fd7e2c1f4c329ae05..e12f189d539b62e5e1bda1c8c28f3a9df0fe44db 100644 (file)
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -189,7 +189,7 @@ try_again:
        /* an old object from a previous incarnation is hogging the slot - we
         * need to wait for it to be destroyed */
 wait_for_old_object:
-       if (fscache_object_is_live(&object->fscache)) {
+       if (fscache_object_is_live(&xobject->fscache)) {
                pr_err("\n");
                pr_err("Error: Unexpected object collision\n");
                cachefiles_printk_object(object, xobject);