On Mon, 5 September 2005 11:47:39 +0800, David Teigland wrote: > > Joern already suggested moving this out of line and into a function (as it > was before) to avoid repeating string constants. In that case the > function, file and line from BUG aren't useful. We now have this, does it > look ok? Ok wrt. my concerns, but not with Greg's. BUG() still gives you everything that you need, except: o fsid Notice how this list is just one entry long? ;) So how about #define gfs2_assert(sdp, assertion) do { \ if (unlikely(!(assertion))) { \ printk(KERN_ERR "GFS2: fsid=\n", (sdp)->sd_fsname); \ BUG(); \ } while (0) Or, to move the constant out of line again void __gfs2_assert(struct gfs2_sbd *sdp) { printk(KERN_ERR "GFS2: fsid=\n", sdp->sd_fsname); } #define gfs2_assert(sdp, assertion) do {\ if (unlikely(!(assertion))) { \ __gfs2_assert(sdp); \ BUG(); \ } while (0) Jörn -- Admonish your friends privately, but praise them openly. -- Publilius Syrus -- Linux-cluster@xxxxxxxxxx http://www.redhat.com/mailman/listinfo/linux-cluster