[PATCH] afs: avoid ifdef inside macro expansion

From: David Howells <dhowells@redhat.com>

Eliminate the printing of the cache token if present: using cpp
conditionals inside macro expansions is not legal and some gcc's fail it.

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index bee62f8f901a49079ebe7963b7e04f08f77c0219..6391520145167a8a73de477a363f6b4640caef29 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -197,16 +197,10 @@ inline int afs_iget(struct super_block *sb, struct afs_fid *fid,
        unlock_new_inode(inode);
 
        *_inode = inode;
-       _leave(" = 0 [CB { v=%u x=%lu t=%u } c=%p]",
+       _leave(" = 0 [CB { v=%u x=%lu t=%u }]",
               vnode->cb_version,
               vnode->cb_timeout.timo_jif,
-              vnode->cb_type,
-#ifdef AFS_CACHING_SUPPORT
-              vnode->cache
-#else
-              NULL
-#endif
-              );
+              vnode->cb_type);
        return 0;
 
        /* failure */