An MBR knows (mbr_lba_self) where it is supposed to go, no

need to pass the value to MBR_write().

Let MBR_write() do the translation from struct mbr to the
struct dos_mbr that will be written to the disk. Thus
eliminating unnecessary struct dos_mbr variables and the
parsing thereof.

No intentional functional change.

diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index a86f3e1..bea508e 100644 (file)
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cmd.c,v 1.132 2021/07/17 21:47:56 krw Exp $   */
+/*     $OpenBSD: cmd.c,v 1.133 2021/07/19 19:23:50 krw Exp $   */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -443,7 +443,6 @@ Xprint(char *args, struct mbr *mbr)
 int
 Xwrite(char *args, struct mbr *mbr)
 {
-       struct dos_mbr          dos_mbr;
        int                     efi, i, n;
 
        for (i = 0, n = 0; i < NDOSPART; i++)
@@ -455,10 +454,8 @@ Xwrite(char *args, struct mbr *mbr)
                        return CMD_CONT;
        }
 
-       MBR_make(mbr, &dos_mbr);
-
        printf("Writing MBR at offset %lld.\n", (long long)mbr->mbr_lba_self);
-       if (MBR_write(mbr->mbr_lba_self, &dos_mbr) == -1) {
+       if (MBR_write(mbr) == -1) {
                warn("error writing MBR");
                return CMD_CONT;
        }
@@ -474,9 +471,6 @@ Xwrite(char *args, struct mbr *mbr)
                GPT_zap_headers();
        }
 
-       /* Refresh in memory copy to reflect what was just written. */
-       MBR_parse(&dos_mbr, mbr->mbr_lba_self, mbr->mbr_lba_firstembr, mbr);
-
        return CMD_CLEAN;
 }
 

diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 22a1012..a863df6 100644 (file)
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mbr.c,v 1.90 2021/07/19 14:30:08 krw Exp $    */
+/*     $OpenBSD: mbr.c,v 1.91 2021/07/19 19:23:50 krw Exp $    */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -222,16 +222,19 @@ MBR_read(const uint64_t lba_self, const uint64_t lba_firstembr, struct mbr *mbr)
 }
 
 int
-MBR_write(const uint64_t sector, const struct dos_mbr *dos_mbr)
+MBR_write(const struct mbr *mbr)
 {
+       struct dos_mbr           dos_mbr;
        char                    *secbuf;
 
-       secbuf = DISK_readsector(sector);
+       secbuf = DISK_readsector(mbr->mbr_lba_self);
        if (secbuf == NULL)
                return -1;
 
-       memcpy(secbuf, dos_mbr, sizeof(*dos_mbr));
-       DISK_writesector(secbuf, sector);
+       MBR_make(mbr, &dos_mbr);
+       memcpy(secbuf, &dos_mbr, sizeof(dos_mbr));
+
+       DISK_writesector(secbuf, mbr->mbr_lba_self);
 
        /* Refresh in-kernel disklabel from the updated disk information. */
        ioctl(disk.dk_fd, DIOCRLDINFO, 0);

diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h
index bc58b4a..b1d5516 100644 (file)
--- a/sbin/fdisk/mbr.h
+++ b/sbin/fdisk/mbr.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mbr.h,v 1.37 2021/07/18 21:40:13 krw Exp $    */
+/*     $OpenBSD: mbr.h,v 1.38 2021/07/19 19:23:50 krw Exp $    */
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -36,7 +36,7 @@ void          MBR_make(const struct mbr *, struct dos_mbr *);
 void           MBR_init(struct mbr *);
 void           MBR_init_GPT(struct mbr *);
 int            MBR_read(const uint64_t, const uint64_t, struct mbr *);
-int            MBR_write(const uint64_t, const struct dos_mbr *);
+int            MBR_write(const struct mbr *);
 int            MBR_protective_mbr(struct mbr *);
 
 #endif /* _MBR_H */