Commit deb5639c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent d54eb723
...@@ -197,16 +197,10 @@ inline int afs_iget(struct super_block *sb, struct afs_fid *fid, ...@@ -197,16 +197,10 @@ inline int afs_iget(struct super_block *sb, struct afs_fid *fid,
unlock_new_inode(inode); unlock_new_inode(inode);
*_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_version,
vnode->cb_timeout.timo_jif, vnode->cb_timeout.timo_jif,
vnode->cb_type, vnode->cb_type);
#ifdef AFS_CACHING_SUPPORT
vnode->cache
#else
NULL
#endif
);
return 0; return 0;
/* failure */ /* failure */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment