Fix a large sector size issue in xfs_repair.

diff --git a/doc/CHANGES b/doc/CHANGES
index b2b672f8fde6828018d7799df8222e5bac9d2508..f45688b7a3ff31f6eee3009961017ca30c97b694 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -5,7 +5,8 @@ xfsprogs-2.4.10 (12 May 2003)
          because xfs_repair uses the correct stripe unit value.
        - Fix a bug in xfs_logprint, when dumping a corrupt log.
        - FreeBSD updates from Alexander Kabaev.
-       - Sector size updates for mkfs (disabled at the moment).
+       - Large sector size updates for mkfs (disabled at the moment).
+       - Large sector size fixes for xfs_repair.
        - Sync up with aeb's mount source for filesystem detection.
 
 xfsprogs-2.4.9 (03 May 2003)

diff --git a/libxfs/init.c b/libxfs/init.c
index e5ffd11a053711fc51aa5e4237d956818f951a50..8ac8ad670996a250f09ec72d35afc4c5ca9db3bd 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -660,7 +660,7 @@ libxfs_mount(
 
        /* Allocate and initialize the per-ag data */
        size = sbp->sb_agcount * sizeof(xfs_perag_t);
-       if ((mp->m_perag = calloc(size, 1)) == NULL) {
+       if (size && (mp->m_perag = calloc(size, 1)) == NULL) {
                fprintf(stderr, _("%s: failed to alloc %ld bytes: %s\n"),
                        progname, (long)size, strerror(errno));
                exit(1);

diff --git a/repair/sb.c b/repair/sb.c
index 798876fc7a96e4a61356c4570726406d70dfcc89..de7fc50b1b4b9c1e6419874b12490ed6ff203ac8 100644 (file)
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -157,7 +157,7 @@ find_secondary_sb(xfs_sb_t *rsb)
                         * found one.  now verify it by looking
                         * for other secondaries.
                         */
-                       bcopy(&bufsb, rsb, bufsb.sb_sectsize);
+                       bcopy(&bufsb, rsb, sizeof(xfs_sb_t));
                        rsb->sb_inprogress = 0;
                        clear_sunit = 1;