mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-15 02:05:33 +00:00
compat-ioctl.c: fix compile with no CONFIG_JBD
The ext3 compat-ioctl translation wants to translate data structures that <linux/jbd.h> only declared when CONFIG_JBD was enabled. So make <linux/jbd.h> play nicely even when we don't actually end up using it. Acked-by: Andrew Morton <akpm@osdl.org> Acked-by: Jeffrey Hundstad <jeffrey.hundstad@mnsu.edu> Acked-by: Zan Lynx <zlynx@acm.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
ac3461ad63
commit
1778d55edb
@ -16,8 +16,6 @@
|
|||||||
#ifndef _LINUX_JBD_H
|
#ifndef _LINUX_JBD_H
|
||||||
#define _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 */
|
/* Allow this file to be included directly into e2fsprogs */
|
||||||
#ifndef __KERNEL__
|
#ifndef __KERNEL__
|
||||||
#include "jfs_compat.h"
|
#include "jfs_compat.h"
|
||||||
@ -1083,19 +1081,4 @@ extern int jbd_blocks_per_page(struct inode *inode);
|
|||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#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 */
|
#endif /* _LINUX_JBD_H */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user