Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1778d55e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarAndrew Morton <akpm@osdl.org>
Acked-by: default avatarJeffrey Hundstad <jeffrey.hundstad@mnsu.edu>
Acked-by: default avatarZan Lynx <zlynx@acm.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ac3461ad

include/linux/jbd.h

+0 −17
Original line number Diff line number Diff line
@@ -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 inode *inode); 


#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 */