diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /fs/jffs2 | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/super.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 6de374513c01..bc4b8106a490 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
| @@ -334,10 +334,10 @@ static int __init init_jffs2_fs(void) | |||
| 334 | which means just 'no padding', without the alignment | 334 | which means just 'no padding', without the alignment |
| 335 | thing. But GCC doesn't have that -- we have to just | 335 | thing. But GCC doesn't have that -- we have to just |
| 336 | hope the structs are the right sizes, instead. */ | 336 | hope the structs are the right sizes, instead. */ |
| 337 | BUG_ON(sizeof(struct jffs2_unknown_node) != 12); | 337 | BUILD_BUG_ON(sizeof(struct jffs2_unknown_node) != 12); |
| 338 | BUG_ON(sizeof(struct jffs2_raw_dirent) != 40); | 338 | BUILD_BUG_ON(sizeof(struct jffs2_raw_dirent) != 40); |
| 339 | BUG_ON(sizeof(struct jffs2_raw_inode) != 68); | 339 | BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68); |
| 340 | BUG_ON(sizeof(struct jffs2_raw_summary) != 32); | 340 | BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32); |
| 341 | 341 | ||
| 342 | printk(KERN_INFO "JFFS2 version 2.2." | 342 | printk(KERN_INFO "JFFS2 version 2.2." |
| 343 | #ifdef CONFIG_JFFS2_FS_WRITEBUFFER | 343 | #ifdef CONFIG_JFFS2_FS_WRITEBUFFER |