Merge with Linux 2.2.8.

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index e8b1e7660..60032292c 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -38,14 +38,13 @@ static void minix_delete_inode(struct inode *inode)
 	minix_free_inode(inode);
 }
 
-static void minix_commit_super (struct super_block * sb,
-			       struct minix_super_block * ms)
+static void minix_commit_super(struct super_block * sb)
 {
 	mark_buffer_dirty(sb->u.minix_sb.s_sbh, 1);
 	sb->s_dirt = 0;
 }
 
-static void minix_write_super (struct super_block * sb)
+static void minix_write_super(struct super_block * sb)
 {
 	struct minix_super_block * ms;
 
@@ -54,7 +53,7 @@ static void minix_write_super (struct super_block * sb)
 
 		if (ms->s_state & MINIX_VALID_FS)
 			ms->s_state &= ~MINIX_VALID_FS;
-		minix_commit_super (sb, ms);
+		minix_commit_super(sb);
 	}
 	sb->s_dirt = 0;
 }
@@ -106,7 +105,7 @@ static int minix_remount (struct super_block * sb, int * flags, char * data)
 		ms->s_state = sb->u.minix_sb.s_mount_state;
 		mark_buffer_dirty(sb->u.minix_sb.s_sbh, 1);
 		sb->s_dirt = 1;
-		minix_commit_super (sb, ms);
+		minix_commit_super(sb);
 	}
 	else {
 	  	/* Mount a partition which is read-only, read-write. */
@@ -195,8 +194,8 @@ static struct super_block *minix_read_super(struct super_block *s, void *data,
 	s->u.minix_sb.s_ms = ms;
 	s->u.minix_sb.s_sbh = bh;
 	s->u.minix_sb.s_mount_state = ms->s_state;
-	s->s_blocksize = 1024;
-	s->s_blocksize_bits = 10;
+	s->s_blocksize = BLOCK_SIZE;
+	s->s_blocksize_bits = BLOCK_SIZE_BITS;
 	s->u.minix_sb.s_ninodes = ms->s_ninodes;
 	s->u.minix_sb.s_nzones = ms->s_nzones;
 	s->u.minix_sb.s_imap_blocks = ms->s_imap_blocks;