linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / sysv / super.c

diff --git a/fs/sysv/super.c b/fs/sysv/super.c
index 876639b..59e76b5 100644 (file)
--- a/fs/sysv/super.c
+++ b/fs/sysv/super.c
@@ -377,10 +377,10 @@ static int sysv_fill_super(struct super_block *sb, void *data, int silent)
        sbi->s_sb = sb;
        sbi->s_block_base = 0;
        sb->s_fs_info = sbi;
-
+       
        sb_set_blocksize(sb, BLOCK_SIZE);
 
-       for (i = 0; i < ARRAY_SIZE(flavours) && !size; i++) {
+       for (i = 0; i < sizeof(flavours)/sizeof(flavours[0]) && !size; i++) {
                brelse(bh);
                bh = sb_bread(sb, flavours[i].block);
                if (!bh)
@@ -506,17 +506,16 @@ failed:
 
 /* Every kernel module contains stuff like this. */
 
-static int sysv_get_sb(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+static struct super_block *sysv_get_sb(struct file_system_type *fs_type,
+       int flags, const char *dev_name, void *data)
 {
-       return get_sb_bdev(fs_type, flags, dev_name, data, sysv_fill_super,
-                          mnt);
+       return get_sb_bdev(fs_type, flags, dev_name, data, sysv_fill_super);
 }
 
-static int v7_get_sb(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+static struct super_block *v7_get_sb(struct file_system_type *fs_type,
+       int flags, const char *dev_name, void *data)
 {
-       return get_sb_bdev(fs_type, flags, dev_name, data, v7_fill_super, mnt);
+       return get_sb_bdev(fs_type, flags, dev_name, data, v7_fill_super);
 }
 
 static struct file_system_type sysv_fs_type = {