DNAME_INLINE_LEN versus CONFIG_GENERIC_LOCKBREAK

[Rasmus Villemoes <linux@rasmusvillemoes.dk>]

Hi,

In dcache.h, DNAME_INLINE_LEN is carefully chosen so that sizeof(struct
dentry) is a (specific) multiple of 64 bytes. Obviously this breaks when
certain debug options are chosen (DEBUG_LOCK_ALLOC and DEBUG_SPINLOCK),
but also, AFAICT, on architectures with CONFIG_GENERIC_LOCKBREAK.

I'm not sure it matters, but if it does, I'd suggest putting a
BUILD_BUG_ON somewhere, protected by suitable #ifdefs, so that the code
documents the assumptions that went into the particular choice of
DNAME_INLINE_LEN (this would also help catch changes to some of the
structures embedded in struct dentry which would violate those
assumptions). 

Rasmus


Something like this, which correctly fails for me on x86_64 when I
transplant CONFIG_GENERIC_LOCKBREAK to its Kconfig.

diff --git a/fs/dcache.c b/fs/dcache.c
index 06f6585..aa72a86 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1433,6 +1433,14 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
 	struct dentry *dentry;
 	char *dname;
 
+#if !defined(CONFIG_DEBUG_LOCK_ALLOC) && !defined(CONFIG_DEBUG_SPINLOCK)
+# ifdef CONFIG_64BIT
+	BUILD_BUG_ON(sizeof(struct dentry) != 192);
+# else
+	BUILD_BUG_ON(sizeof(struct dentry) != 128);
+# endif
+#endif
+
 	dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL);
 	if (!dentry)
 		return NULL;