summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@shaggy.austin.ibm.com>2003-05-29 00:47:08 -0500
committerDave Kleikamp <shaggy@shaggy.austin.ibm.com>2003-05-29 00:47:08 -0500
commitfb693d2d351b4524bf784979f313f82788beca1c (patch)
tree273a0d21df5853b3437cd1a639e4b0e3c14a14ba
parentbe7b33d2bff85ec9dafc5ec0dfbc8a9f482057e8 (diff)
JFS: resize fixes
Bmap control page was not always being updated. Superblock's s_size field was incorrectly set on big-endian hardware.
-rw-r--r--fs/jfs/resize.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
index 9da18ef683fd..982e628ae03d 100644
--- a/fs/jfs/resize.c
+++ b/fs/jfs/resize.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) International Business Machines Corp., 2000-2002
+ * Copyright (c) International Business Machines Corp., 2000-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -348,7 +348,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
/* need to grow map file ? */
if (nPages == newNpages)
- goto updateImap;
+ goto finalizeBmap;
/*
* grow bmap file for the new map pages required:
@@ -414,6 +414,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
if (XSize)
goto extendBmap;
+ finalizeBmap:
/* finalize bmap */
dbFinalizeBmap(ipbmap);
@@ -427,7 +428,6 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
* (computation of ag number from agstart based on agsize
* will correctly identify the new ag);
*/
- updateImap:
/* if new AG size the same as old AG size, done! */
if (bmp->db_agsize != old_agsize) {
if ((rc = diExtendFS(ipimap, ipbmap)))
@@ -485,8 +485,8 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
/* mark extendfs() completion */
j_sb->s_state &= cpu_to_le32(~FM_EXTENDFS);
- j_sb->s_size = cpu_to_le64(bmp->db_mapsize) <<
- le16_to_cpu(j_sb->s_l2bfactor);
+ j_sb->s_size = cpu_to_le64(bmp->db_mapsize <<
+ le16_to_cpu(j_sb->s_l2bfactor));
j_sb->s_agsize = cpu_to_le32(bmp->db_agsize);
/* update inline log space descriptor */