Fix gcc -Wall issues in e2fsck sources

[tools/e2fsprogs.git] / e2fsck / swapfs.c

diff --git a/e2fsck/swapfs.c b/e2fsck/swapfs.c
index 513859b..fb7270c 100644 (file)
--- a/e2fsck/swapfs.c
+++ b/e2fsck/swapfs.c
@@ -110,21 +110,22 @@ static void swap_inode_blocks(e2fsck_t ctx, ext2_ino_t ino, char *block_buf,
 static void swap_inodes(e2fsck_t ctx)
 {
        ext2_filsys fs = ctx->fs;
-       int                     i, group;
+       dgrp_t                  group;
+       unsigned int            i;
        ext2_ino_t              ino = 1;
-       char                    *buf, *block_buf;
+       char                    *buf = NULL, *block_buf = NULL;
        errcode_t               retval;
        struct ext2_inode *     inode;
 
        e2fsck_use_inode_shortcuts(ctx, 1);
        
        retval = ext2fs_get_mem(fs->blocksize * fs->inode_blocks_per_group,
-                               (void **) &buf);
+                               &buf);
        if (retval) {
                com_err("swap_inodes", retval,
                        _("while allocating inode buffer"));
                ctx->flags |= E2F_FLAG_ABORT;
-               return;
+               goto errout;
        }
        block_buf = (char *) e2fsck_allocate_memory(ctx, fs->blocksize * 4,
                                                    "block interate buffer");
@@ -137,7 +138,7 @@ static void swap_inodes(e2fsck_t ctx)
                                _("while reading inode table (group %d)"),
                                group);
                        ctx->flags |= E2F_FLAG_ABORT;
-                       return;
+                       goto errout;
                }
                inode = (struct ext2_inode *) buf;
                for (i=0; i < fs->super->s_inodes_per_group;
@@ -162,7 +163,7 @@ static void swap_inodes(e2fsck_t ctx)
                                swap_inode_blocks(ctx, ino, block_buf, inode);
 
                        if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
-                               return;
+                               goto errout;
                        
                        if (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)
                                ext2fs_swap_inode(fs, inode, inode, 1);
@@ -175,13 +176,42 @@ static void swap_inodes(e2fsck_t ctx)
                                _("while writing inode table (group %d)"),
                                group);
                        ctx->flags |= E2F_FLAG_ABORT;
-                       return;
+                       goto errout;
                }
        }
-       ext2fs_free_mem((void **) &buf);
-       ext2fs_free_mem((void **) &block_buf);
+errout:
+       if (buf)
+               ext2fs_free_mem(&buf);
+       if (block_buf)
+               ext2fs_free_mem(&block_buf);
        e2fsck_use_inode_shortcuts(ctx, 0);
+       ext2fs_flush_icache(fs);
+}
+
+#if defined(__powerpc__) && defined(EXT2FS_ENABLE_SWAPFS)
+/*
+ * On the PowerPC, the big-endian variant of the ext2 filesystem
+ * has its bitmaps stored as 32-bit words with bit 0 as the LSB
+ * of each word.  Thus a bitmap with only bit 0 set would be, as
+ * a string of bytes, 00 00 00 01 00 ...
+ * To cope with this, we byte-reverse each word of a bitmap if
+ * we have a big-endian filesystem, that is, if we are *not*
+ * byte-swapping other word-sized numbers.
+ */
+#define EXT2_BIG_ENDIAN_BITMAPS
+#endif
+
+#ifdef EXT2_BIG_ENDIAN_BITMAPS
+static void ext2fs_swap_bitmap(ext2fs_generic_bitmap bmap)
+{
+       __u32 *p = (__u32 *) bmap->bitmap;
+       int n, nbytes = (bmap->end - bmap->start + 7) / 8;
+               
+       for (n = nbytes / sizeof(__u32); n > 0; --n, ++p)
+               *p = ext2fs_swab32(*p);
 }
+#endif
+
 
 void swap_filesys(e2fsck_t ctx)
 {
@@ -222,7 +252,16 @@ void swap_filesys(e2fsck_t ctx)
                fs->flags |= EXT2_FLAG_SWAP_BYTES;
        fs->flags &= ~(EXT2_FLAG_SWAP_BYTES_READ|
                       EXT2_FLAG_SWAP_BYTES_WRITE);
+
+#ifdef EXT2_BIG_ENDIAN_BITMAPS
+       e2fsck_read_bitmaps(ctx);
+       ext2fs_swap_bitmap(fs->inode_map);
+       ext2fs_swap_bitmap(fs->block_map);
+       fs->flags |= EXT2_FLAG_BB_DIRTY | EXT2_FLAG_IB_DIRTY;
+#endif
+       fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
        ext2fs_flush(fs);
+       fs->flags |= EXT2_FLAG_MASTER_SB_ONLY;
        
 #ifdef RESOURCE_TRACK
        if (ctx->options & E2F_OPT_TIME2)