Re: Linux 2.6.15-rc2

[Linus Torvalds <torvalds@osdl.org>]

On Tue, 22 Nov 2005, Andrew Morton wrote:
> > 
> > Why does it happen at all, though?
> 
> davem recently merged a patch which adds ext3 ioctls to fs/compat_ioctl.c. 
> That required inclusion of ext3 and jbd header files.  Those files explode
> unpleasantly when CONFIG_JBD=n.

Oh. How about just making jbd.h do the rigt thing, and not care about the 
configuration?

If we include jbd.h, we want the jbd data structures. There's never any 
reason to care whether jbd is enabled or not afaik.

Ie maybe just something like this?

(Untested, obviously. I'm just assuming that anything that actually 
_needs_ the jbd functionality should have made sure that jdb is enabled.)

Zan, Jeffrey?

		Linus
---
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index aa56172..dcde7ad 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -16,8 +16,6 @@
 #ifndef _LINUX_JBD_H
 #define _LINUX_JBD_H
 
-#if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || !defined(__KERNEL__)
-
 /* Allow this file to be included directly into e2fsprogs */
 #ifndef __KERNEL__
 #include "jfs_compat.h"
@@ -1083,19 +1081,4 @@ extern int jbd_blocks_per_page(struct in
 
 #endif	/* __KERNEL__ */
 
-#endif	/* CONFIG_JBD || CONFIG_JBD_MODULE || !__KERNEL__ */
-
-/*
- * Compatibility no-ops which allow the kernel to compile without CONFIG_JBD
- * go here.
- */
-
-#if defined(__KERNEL__) && !(defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE))
-
-#define J_ASSERT(expr)			do {} while (0)
-#define J_ASSERT_BH(bh, expr)		do {} while (0)
-#define buffer_jbd(bh)			0
-#define journal_buffer_journal_lru(bh)	0
-
-#endif	/* defined(__KERNEL__) && !defined(CONFIG_JBD) */
 #endif	/* _LINUX_JBD_H */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/