new helper: ext2_image_size()

... implemented that way since the next commit will leave it
almost alone in ext2_fs.h - most of the file (including
struct ext2_super_block) is going to move to fs/ext2/ext2.h.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 2aa019368504..2ad747e909fb 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -550,6 +550,7 @@ static __init void memory_setup(void)
 {
 #ifdef CONFIG_MTD_UCLINUX
         unsigned long mtd_phys = 0;
+        unsigned long n;
 #endif
         unsigned long max_mem;
 
@@ -593,9 +594,9 @@ static __init void memory_setup(void)
         mtd_size = PAGE_ALIGN(*((unsigned long *)(mtd_phys + 8)));
 
 # if defined(CONFIG_EXT2_FS) || defined(CONFIG_EXT3_FS)
-        if (*((unsigned short *)(mtd_phys + 0x438)) == EXT2_SUPER_MAGIC)
-                mtd_size =
-                    PAGE_ALIGN(*((unsigned long *)(mtd_phys + 0x404)) << 10);
+        n = ext2_image_size((void *)(mtd_phys + 0x400));
+        if (n)
+                mtd_size = PAGE_ALIGN(n * 1024);
 # endif
 
 # if defined(CONFIG_CRAMFS)