From e340d883a57401d52c9c4a193e28167a15bf53be Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Wed, 27 Sep 2006 01:49:28 -0700 Subject: [PATCH] --- yaml --- r: 36121 b: refs/heads/master c: 2aed3484695ecb03f1395bb62f1099e8b0826124 h: refs/heads/master i: 36119: 87b87604ec975467d248d24799a00a48a7f18e43 v: v3 --- [refs] | 2 +- trunk/fs/jbd/journal.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c1be09b83a17..d2fecd51bd81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae6ddcc5f24d6b06ae9231dc128904750a4155e0 +refs/heads/master: 2aed3484695ecb03f1395bb62f1099e8b0826124 diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c index 87c5a6d00805..2613fca92740 100644 --- a/trunk/fs/jbd/journal.c +++ b/trunk/fs/jbd/journal.c @@ -2047,13 +2047,7 @@ static int __init journal_init(void) { int ret; -/* Static check for data structure consistency. There's no code - * invoked --- we'll just get a linker failure if things aren't right. - */ - extern void journal_bad_superblock_size(void); - if (sizeof(struct journal_superblock_s) != 1024) - journal_bad_superblock_size(); - + BUILD_BUG_ON(sizeof(struct journal_superblock_s) != 1024); ret = journal_init_caches(); if (ret != 0)