Merge ../scsi-rc-fixes-2.6

1 files changed, 2 insertions, 6 deletions

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index c11a4b9fb863..1e36bae4d0eb 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -149,12 +149,8 @@ static int minix_fill_super(struct super_block *s, void *data, int silent)
                 return -ENOMEM;
         s->s_fs_info = sbi;
 
-        /* N.B. These should be compile-time tests.
-           Unfortunately that is impossible. */
-        if (32 != sizeof (struct minix_inode))
-                panic("bad V1 i-node size");
-        if (64 != sizeof(struct minix2_inode))
-                panic("bad V2 i-node size");
+        BUILD_BUG_ON(32 != sizeof (struct minix_inode));
+        BUILD_BUG_ON(64 != sizeof(struct minix2_inode));
 
         if (!sb_set_blocksize(s, BLOCK_SIZE))
                 goto out_bad_hblock;