Rename "struct partition" to "struct part_geom"

Change-Id: Ifaf9795ba70f5b933599b2a6ec9415e6bd13200c

diff --git a/commands/autopart/autopart.c b/commands/autopart/autopart.c
index c6fd7112ca344392a3062ea604d3e7a98455073f..4d6a85cb029eea526f7a151420a7820c1c088da8 100644 (file)
--- a/commands/autopart/autopart.c
+++ b/commands/autopart/autopart.c
@@ -501,7 +501,7 @@ void geometry(void)
 {
        struct stat dst;
        int err= 0;
-       struct partition geometry;
+       struct part_geom geometry;
 
        if (submerged) {
                /* Geometry already known. */
@@ -2123,7 +2123,7 @@ scribble_region(region_t *reg, struct part_entry **pe, int *made_new)
 int
 sanitycheck_failed(char *dev, struct part_entry *pe)
 {
-       struct partition part;
+       struct part_geom part;
        int fd;
        unsigned long it_lowsec, it_secsize;
 

diff --git a/commands/devsize/devsize.c b/commands/devsize/devsize.c
index a85d20821a04906133e8b38ad745538ea319211b..9d8cbdfad36e04531cff28572dc0e860178cd588 100644 (file)
--- a/commands/devsize/devsize.c
+++ b/commands/devsize/devsize.c
@@ -35,7 +35,7 @@ unsigned long sizeup(device)
 char *device;
 {
   int fd;
-  struct partition entry;
+  struct part_geom entry;
   unsigned long d;
 
   if ((fd = open(device, O_RDONLY)) == -1) {

diff --git a/commands/fdisk/fdisk.c b/commands/fdisk/fdisk.c
index c8fcaaeaad043398a68eccb710f7c7216e0e34e4..4c237f27a99b5cf525a4b7f912708d28b569aac7 100644 (file)
--- a/commands/fdisk/fdisk.c
+++ b/commands/fdisk/fdisk.c
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
 
 void getgeom(void)
 {
-  struct partition geom;
+  struct part_geom geom;
   int fd, r;
 
   if (override) return;

diff --git a/commands/part/part.c b/commands/part/part.c
index eba6496db008a38036722ff9ad6d17f7a6ad231e..d141d8553b3c583f3da3658b0dcc878817fdfc67 100644 (file)
--- a/commands/part/part.c
+++ b/commands/part/part.c
@@ -453,7 +453,7 @@ void geometry(void)
 {
        struct stat dst;
        int err= 0;
-       struct partition geometry;
+       struct part_geom geometry;
 
        if (submerged) {
                /* Geometry already known. */

diff --git a/commands/partition/partition.c b/commands/partition/partition.c
index dac69cd71b2a1d2dedbe0ca44c9a7c80136dc229..a2d555b7ec0917280061aa977df5a714bd72dccb 100644 (file)
--- a/commands/partition/partition.c
+++ b/commands/partition/partition.c
@@ -285,7 +285,7 @@ void geometry(void)
  */
 {
        int fd;
-       struct partition geometry;
+       struct part_geom geometry;
        struct stat sb;
 
        if ((fd= open(device, O_RDONLY)) < 0) fatal(device);

diff --git a/commands/repartition/repartition.c b/commands/repartition/repartition.c
index ba929f2813a6ae9ab629e08dce1a19643ae15ad5..ace391b60e29458e8bd563a993ac43674fcc686c 100644 (file)
--- a/commands/repartition/repartition.c
+++ b/commands/repartition/repartition.c
@@ -100,7 +100,7 @@ char *finddev(dev_t device)
 #define DSETP  0
 #define DGETP  1
 
-int diocntl(dev_t device, int request, struct partition *entry)
+int diocntl(dev_t device, int request, struct part_geom *entry)
 /* Get or set the geometry of a device. */
 {
        char *name;
@@ -115,7 +115,7 @@ int diocntl(dev_t device, int request, struct partition *entry)
        return r;
 }
 
-struct partition geometry;     /* Geometry of the device. */
+struct part_geom geometry;     /* Geometry of the device. */
 
 void print_chs(unsigned long sector)
 {
@@ -154,7 +154,7 @@ void show_part(char *name, unsigned long base, unsigned long size)
 int main(int argc, char **argv)
 {
        struct stat hdst;
-       struct partition whole, entry;
+       struct part_geom whole, entry;
        struct part_entry table[4], *pe;
        int drive, par = 0, device, incr;
        int partf;

diff --git a/commands/vol/vol.c b/commands/vol/vol.c
index ebede7900008e88a16820aeb1f533c12050ebc10..43264912bf34ffd18fac4593b17b44bc5819698a 100644 (file)
--- a/commands/vol/vol.c
+++ b/commands/vol/vol.c
@@ -66,7 +66,7 @@ char *argv[];
   int volume = 1, fd, tty, i, init, autovolsize;
   char *p, *name;
   struct stat stb;
-  struct partition part;
+  struct part_geom part;
   char key;
 
   /* Fetch and verify the arguments. */

diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c
index 6e1f1fb866f0204c741001976de8aed962f4e8ff..e59dbbd1076f89ca67700ea221407f96a3806a93 100644 (file)
--- a/drivers/at_wini/at_wini.c
+++ b/drivers/at_wini/at_wini.c
@@ -166,7 +166,7 @@ static void w_intr_wait(void);
 static int at_intr_wait(void);
 static int w_waitfor(int mask, int value);
 static int w_waitfor_dma(int mask, int value);
-static void w_geometry(dev_t minor, struct partition *entry);
+static void w_geometry(dev_t minor, struct part_geom *entry);
 #if ENABLE_ATAPI
 static int atapi_sendpacket(u8_t *packet, unsigned cnt, int do_dma);
 static int atapi_intr_wait(int dma, size_t max);
@@ -1869,7 +1869,7 @@ int value;                        /* required status */
 /*===========================================================================*
  *                             w_geometry                                   *
  *===========================================================================*/
-static void w_geometry(dev_t minor, struct partition *entry)
+static void w_geometry(dev_t minor, struct part_geom *entry)
 {
   struct wini *wn;
 

diff --git a/drivers/filter/driver.c b/drivers/filter/driver.c
index e5c16dcbe639bccd86adb639ce23d2a172a4af38..35464b10efd0ac33ce068ffd384fab40fc84c9e6 100644 (file)
--- a/drivers/filter/driver.c
+++ b/drivers/filter/driver.c
@@ -24,7 +24,7 @@ static int driver_open(int which)
         */
        message msg;
        cp_grant_id_t gid;
-       struct partition part;
+       struct part_geom part;
        sector_t sectors;
        int r;
 

diff --git a/drivers/filter/main.c b/drivers/filter/main.c
index d2c966cd83455a43d6652370b14a4987ad0beeca..b825ed31c26507fddd65e6ef2fa7a507651a685a 100644 (file)
--- a/drivers/filter/main.c
+++ b/drivers/filter/main.c
@@ -241,7 +241,7 @@ static int do_vrdwt(int flag_rw)
  *===========================================================================*/
 static int do_ioctl(message *m)
 {
-       struct partition sizepart;
+       struct part_geom sizepart;
 
        switch(m->BDEV_REQUEST) {
        case DIOCSETP:
@@ -260,7 +260,7 @@ static int do_ioctl(message *m)
 
                if(sys_safecopyto(who_e, (vir_bytes) grant_id, 0,
                                (vir_bytes) &sizepart,
-                               sizeof(struct partition)) != OK) {
+                               sizeof(struct part_geom)) != OK) {
                        printf("Filter: DIOCGETP safecopyto failed\n");
                        return EIO;
                }

diff --git a/drivers/floppy/floppy.c b/drivers/floppy/floppy.c
index 2fb576c5f337f142a2f9f6fa1db805c8ecc823d6..1150837d2bcec34b7d22820f76925baef2a9ed07 100644 (file)
--- a/drivers/floppy/floppy.c
+++ b/drivers/floppy/floppy.c
@@ -261,7 +261,7 @@ static int read_id(void);
 static int f_do_open(dev_t minor, int access);
 static int f_do_close(dev_t minor);
 static int test_read(int density);
-static void f_geometry(dev_t minor, struct partition *entry);
+static void f_geometry(dev_t minor, struct part_geom *entry);
 
 /* Entry points to this driver. */
 static struct blockdriver f_dtab = {
@@ -1350,7 +1350,7 @@ static int test_read(int density)
 /*===========================================================================*
  *                             f_geometry                                   *
  *===========================================================================*/
-static void f_geometry(dev_t minor, struct partition *entry)
+static void f_geometry(dev_t minor, struct part_geom *entry)
 {
   if (f_prepare(minor) == NULL) return;
 

diff --git a/drivers/virtio_blk/virtio_blk.c b/drivers/virtio_blk/virtio_blk.c
index f62fd325380ad6c408f7ea21f93a3f4ac5a0d168..cc1b7d06931fab9b43ab1f96e6ade69d4e3983e9 100644 (file)
--- a/drivers/virtio_blk/virtio_blk.c
+++ b/drivers/virtio_blk/virtio_blk.c
@@ -86,7 +86,7 @@ static ssize_t virtio_blk_transfer(dev_t minor, int write, u64_t position,
 static int virtio_blk_ioctl(dev_t minor, unsigned int req, endpoint_t endpt,
                            cp_grant_id_t grant);
 static struct device * virtio_blk_part(dev_t minor);
-static void virtio_blk_geometry(dev_t minor, struct partition *entry);
+static void virtio_blk_geometry(dev_t minor, struct part_geom *entry);
 static void virtio_blk_device_intr(void);
 static void virtio_blk_spurious_intr(void);
 static void virtio_blk_intr(unsigned int irqs);
@@ -422,7 +422,7 @@ virtio_blk_part(dev_t minor)
 }
 
 static void
-virtio_blk_geometry(dev_t minor, struct partition *entry)
+virtio_blk_geometry(dev_t minor, struct part_geom *entry)
 {
        /* Only for the drive */
        if (minor != 0)

diff --git a/include/minix/blockdriver.h b/include/minix/blockdriver.h
index 10da49b18bc895fee92989bfc150dd0bc7379978..6d28265ee6c21c30a08a7c173df5079c44102e7f 100644 (file)
--- a/include/minix/blockdriver.h
+++ b/include/minix/blockdriver.h
@@ -23,7 +23,7 @@ struct blockdriver {
          cp_grant_id_t grant);
   void(*bdr_cleanup) (void);
   struct device *(*bdr_part)(dev_t minor);
-  void(*bdr_geometry) (dev_t minor, struct partition *part);
+  void(*bdr_geometry) (dev_t minor, struct part_geom *part);
   void(*bdr_intr) (unsigned int irqs);
   void(*bdr_alarm) (clock_t stamp);
   int(*bdr_other) (message *m_ptr);

diff --git a/include/minix/partition.h b/include/minix/partition.h
index 21f743d70bfcea6b5bc9db36b47ce9ffc81d16dd..2e9b431d077f59ca62ebb71ee7d3d1e088173220 100644 (file)
--- a/include/minix/partition.h
+++ b/include/minix/partition.h
@@ -12,7 +12,7 @@
 
 int minix_sizeup(char *name, u64_t *bytes);
 
-struct partition {
+struct part_geom {
   u64_t base;          /* byte offset to the partition start */
   u64_t size;          /* number of bytes in the partition */
   unsigned cylinders;  /* disk geometry */

diff --git a/include/sys/ioc_disk.h b/include/sys/ioc_disk.h
index aa2085d5749f2e102f07dbe2f2937bd42aac2691..f899c4ddfc5fe5198b34e4cff835bf3e8472bdb5 100644 (file)
--- a/include/sys/ioc_disk.h
+++ b/include/sys/ioc_disk.h
@@ -8,8 +8,8 @@
 
 #include <minix/ioctl.h>
 
-#define DIOCSETP       _IOW('d', 3, struct partition)
-#define DIOCGETP       _IOR('d', 4, struct partition)
+#define DIOCSETP       _IOW('d', 3, struct part_geom)
+#define DIOCGETP       _IOR('d', 4, struct part_geom)
 #define DIOCEJECT      _IO ('d', 5)
 #define DIOCTIMEOUT    _IORW('d', 6, int)
 #define DIOCOPENCT     _IOR('d', 7, int)

diff --git a/lib/libblockdriver/driver.c b/lib/libblockdriver/driver.c
index 479c20dbf6e079e167e550f80d3f91078959839e..f45b11552ebc9a33162ca4584264798d4d49921b 100644 (file)
--- a/lib/libblockdriver/driver.c
+++ b/lib/libblockdriver/driver.c
@@ -262,7 +262,7 @@ static int do_dioctl(struct blockdriver *bdp, dev_t minor,
 {
 /* Carry out a disk-specific I/O control request. */
   struct device *dv;
-  struct partition entry;
+  struct part_geom entry;
   int r = EINVAL;
 
   switch (request) {

diff --git a/lib/libc/sys-minix/sizeup.c b/lib/libc/sys-minix/sizeup.c
index ea843075ae520719776c003a34f0d15c7f4dee4b..abf5323d264912c2eca0a7e1d21f537adc61cc70 100644 (file)
--- a/lib/libc/sys-minix/sizeup.c
+++ b/lib/libc/sys-minix/sizeup.c
@@ -29,7 +29,7 @@ char *device;
 u64_t *bytes;
 {
   int fd;
-  struct partition entry;
+  struct part_geom entry;
   struct stat st;
 
   if ((fd = open(device, O_RDONLY)) == -1) {

diff --git a/man/man4/controller.4 b/man/man4/controller.4
index a556377a436e1b9bb31048ddf104e8e8384bacac..66fa6251ca0f581b08928d0ebd6cccdb8f651439 100644 (file)
--- a/man/man4/controller.4
+++ b/man/man4/controller.4
@@ -154,7 +154,7 @@ a partition.  This is what <minix/partition.h> looks like:
 .sp
 .nf
 .ta +2n +25n
-struct partition {
+struct part_geom {
        u64_t base;     /* byte offset to the partition start */
        u64_t size;     /* number of bytes in the partition */
        unsigned cylinders;     /* disk geometry for partitioning */

diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 1e6db347d96be3ed1ef7746ce43ea50e9a66f2dd..42e38f73df99acb3c0f3cd8cb15497d92e2461fd 100644 (file)
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -41,10 +41,6 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__minix) && !defined(_STANDALONE)
-#include <minix/partition.h>
-#endif
-
 /*
  * Each disk has a label which includes information about the hardware
  * disk geometry, filesystem partitions, and drive specific information.
@@ -184,10 +180,6 @@ struct disklabel {
        uint16_t d_npartitions; /* number of partitions in following */
        uint32_t d_bbsize;              /* size of boot area at sn0, bytes */
        uint32_t d_sbsize;              /* max size of fs superblock, bytes */
-#if defined(__minix) && !defined(_STANDALONE)
-       struct partition                /* the partition table */
-       d_partitions[MAXPARTITIONS];  /* actually may be more */
-#else
        struct  partition {             /* the partition table */
                uint32_t p_size;        /* number of sectors in partition */
                uint32_t p_offset;      /* starting sector */
@@ -207,7 +199,6 @@ struct disklabel {
 #define        p_cpg   __partition_u1.cpg
 #define        p_sgs   __partition_u1.sgs
        } d_partitions[MAXPARTITIONS];  /* actually may be more */
-#endif /* defined(__minix) */
 };
 
 #if defined(__HAVE_OLD_DISKLABEL) && !HAVE_NBTOOL_CONFIG_H

diff --git a/test/blocktest/blocktest.c b/test/blocktest/blocktest.c
index 8f2299ef56418614ac834b63472a66664614aa53..dc87f0f7ee59b07010d133956db15879528d7de8 100644 (file)
--- a/test/blocktest/blocktest.c
+++ b/test/blocktest/blocktest.c
@@ -39,7 +39,7 @@ static int max_size = 131072;         /* maximum total size of any req */
  * it to a value lower than the driver supports.
  */
 
-static struct partition part;          /* base and size of target partition */
+static struct part_geom part;          /* base and size of target partition */
 
 #define NR_OPENED 10                   /* maximum number of opened devices */
 static dev_t opened[NR_OPENED];        /* list of currently opened devices */
@@ -1426,7 +1426,7 @@ static void vir_limits(dev_t sub0_minor, dev_t sub1_minor, int part_secs)
        /* Create virtual, temporary subpartitions through the DIOCSETP ioctl,
         * and perform tests on the resulting subpartitions.
         */
-       struct partition subpart, subpart2;
+       struct part_geom subpart, subpart2;
        size_t sub_size;
        result_t res;
 
@@ -1495,7 +1495,7 @@ static void real_limits(dev_t sub0_minor, dev_t sub1_minor, int part_secs)
         */
        u8_t *buf_ptr;
        size_t buf_size, sub_size;
-       struct partition subpart;
+       struct part_geom subpart;
        struct part_entry *entry;
        result_t res;