fscache: Change %p in format strings to something else

Change plain %p in format strings in fscache code to something more useful,
since %p is now hashed before printing and thus no longer matches the
contents of an oops register dump.

Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
cc: linux-cachefs@redhat.com
Link: https://lore.kernel.org/r/160588474843.3465195.5446072310069374803.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/162431199509.2908479.2950631488219944294.stgit@warthog.procyon.org.uk/

diff --git a/fs/fscache/cache.c b/fs/fscache/cache.c
index 8a6ffcac867f6fd2e59ac473e46b2e4b95f01361..e7a5d7ab4085354dcb8f93915fc82e9a6c981a6f 100644 (file)
--- a/fs/fscache/cache.c
+++ b/fs/fscache/cache.c
@@ -116,7 +116,7 @@ struct fscache_cache *fscache_select_cache_for_object(
                        cache = NULL;
 
                spin_unlock(&cookie->lock);
-               _leave(" = %p [parent]", cache);
+               _leave(" = %s [parent]", cache ? cache->tag->name : "NULL");
                return cache;
        }
 
@@ -152,14 +152,14 @@ struct fscache_cache *fscache_select_cache_for_object(
        if (test_bit(FSCACHE_IOERROR, &tag->cache->flags))
                return NULL;
 
-       _leave(" = %p [specific]", tag->cache);
+       _leave(" = %s [specific]", tag->name);
        return tag->cache;
 
 no_preference:
        /* netfs has no preference - just select first cache */
        cache = list_entry(fscache_cache_list.next,
                           struct fscache_cache, link);
-       _leave(" = %p [first]", cache);
+       _leave(" = %s [first]", cache->tag->name);
        return cache;
 }
 
@@ -334,7 +334,7 @@ static void fscache_withdraw_all_objects(struct fscache_cache *cache,
                                            struct fscache_object, cache_link);
                        list_move_tail(&object->cache_link, dying_objects);
 
-                       _debug("withdraw %p", object->cookie);
+                       _debug("withdraw %x", object->cookie->debug_id);
 
                        /* This must be done under object_list_lock to prevent
                         * a race with fscache_drop_object().

diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index 2f4d5271ad2ed970724a55d6f29903c4b8f7f755..ec9bce33085f7d85cf5e99f12b1555510b3dbc24 100644 (file)
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
@@ -375,7 +375,7 @@ void __fscache_enable_cookie(struct fscache_cookie *cookie,
                             bool (*can_enable)(void *data),
                             void *data)
 {
-       _enter("%p", cookie);
+       _enter("%x", cookie->debug_id);
 
        trace_fscache_enable(cookie);
 
@@ -472,10 +472,8 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie,
 
        /* we may be required to wait for lookup to complete at this point */
        if (!fscache_defer_lookup) {
-               _debug("non-deferred lookup %p", &cookie->flags);
                wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
                            TASK_UNINTERRUPTIBLE);
-               _debug("complete");
                if (test_bit(FSCACHE_COOKIE_UNAVAILABLE, &cookie->flags))
                        goto unavailable;
        }
@@ -500,7 +498,7 @@ static int fscache_alloc_object(struct fscache_cache *cache,
        struct fscache_object *object;
        int ret;
 
-       _enter("%p,%p{%s}", cache, cookie, cookie->def->name);
+       _enter("%s,%x{%s}", cache->tag->name, cookie->debug_id, cookie->def->name);
 
        spin_lock(&cookie->lock);
        hlist_for_each_entry(object, &cookie->backing_objects,
@@ -676,7 +674,7 @@ EXPORT_SYMBOL(__fscache_invalidate);
  */
 void __fscache_wait_on_invalidate(struct fscache_cookie *cookie)
 {
-       _enter("%p", cookie);
+       _enter("%x", cookie->debug_id);
 
        wait_on_bit(&cookie->flags, FSCACHE_COOKIE_INVALIDATING,
                    TASK_UNINTERRUPTIBLE);
@@ -731,7 +729,7 @@ void __fscache_disable_cookie(struct fscache_cookie *cookie,
        struct fscache_object *object;
        bool awaken = false;
 
-       _enter("%p,%u", cookie, invalidate);
+       _enter("%x,%u", cookie->debug_id, invalidate);
 
        trace_fscache_disable(cookie);
 
@@ -821,8 +819,8 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie,
                return;
        }
 
-       _enter("%p{%s,%p,%d},%d",
-              cookie, cookie->def->name, cookie->netfs_data,
+       _enter("%x{%s,%d},%d",
+              cookie->debug_id, cookie->def->name,
               atomic_read(&cookie->n_active), retire);
 
        trace_fscache_relinquish(cookie, retire);
@@ -877,7 +875,7 @@ void fscache_cookie_put(struct fscache_cookie *cookie,
        struct fscache_cookie *parent;
        int usage;
 
-       _enter("%p", cookie);
+       _enter("%x", cookie->debug_id);
 
        do {
                usage = atomic_dec_return(&cookie->usage);

diff --git a/fs/fscache/object.c b/fs/fscache/object.c
index b3853274733f9a6f74b3b847929e2b05e6f4140b..f346a78f4bd67a1b6243aae4da7e1f22bb78bc7b 100644 (file)
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -518,7 +518,6 @@ void fscache_object_lookup_negative(struct fscache_object *object)
                set_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
                clear_bit(FSCACHE_COOKIE_UNAVAILABLE, &cookie->flags);
 
-               _debug("wake up lookup %p", &cookie->flags);
                clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
                wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
        }