aboutsummaryrefslogtreecommitdiff
path: root/sys/geom/part
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2017-11-21 05:42:13 +0000
committerWarner Losh <imp@FreeBSD.org>2017-11-21 05:42:13 +0000
commit2ab96835659a9242e82ed8c9998d97db7e81c216 (patch)
tree2684e70e04cbc3dbd32deed625a7676653c2e903 /sys/geom/part
parentd65b6588d6226bc3540a1b8c61e059219b40ec9b (diff)
Notes
Diffstat (limited to 'sys/geom/part')
-rw-r--r--sys/geom/part/g_part.c2
-rw-r--r--sys/geom/part/g_part_apm.c2
-rw-r--r--sys/geom/part/g_part_bsd.c8
-rw-r--r--sys/geom/part/g_part_bsd64.c6
-rw-r--r--sys/geom/part/g_part_ebr.c12
-rw-r--r--sys/geom/part/g_part_gpt.c12
-rw-r--r--sys/geom/part/g_part_mbr.c10
7 files changed, 26 insertions, 26 deletions
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c
index 5220df47de89f..1260c2c84d66f 100644
--- a/sys/geom/part/g_part.c
+++ b/sys/geom/part/g_part.c
@@ -1352,7 +1352,7 @@ g_part_ctl_resize(struct gctl_req *req, struct g_part_parms *gpp)
/* Deny shrinking of an opened partition. */
gctl_error(req, "%d", EBUSY);
return (EBUSY);
- }
+ }
}
error = G_PART_RESIZE(table, entry, gpp);
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c
index 90357cf047af3..4a88ca17833c8 100644
--- a/sys/geom/part/g_part_apm.c
+++ b/sys/geom/part/g_part_apm.c
@@ -207,7 +207,7 @@ apm_read_ent(struct g_consumer *cp, uint32_t blk, struct apm_ent *ent,
}
static int
-g_part_apm_add(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_apm_add(struct g_part_table *basetable, struct g_part_entry *baseentry,
struct g_part_parms *gpp)
{
struct g_part_apm_entry *entry;
diff --git a/sys/geom/part/g_part_bsd.c b/sys/geom/part/g_part_bsd.c
index ee88b4636a695..e1a81f9c13963 100644
--- a/sys/geom/part/g_part_bsd.c
+++ b/sys/geom/part/g_part_bsd.c
@@ -72,7 +72,7 @@ static int g_part_bsd_destroy(struct g_part_table *, struct g_part_parms *);
static void g_part_bsd_dumpconf(struct g_part_table *, struct g_part_entry *,
struct sbuf *, const char *);
static int g_part_bsd_dumpto(struct g_part_table *, struct g_part_entry *);
-static int g_part_bsd_modify(struct g_part_table *, struct g_part_entry *,
+static int g_part_bsd_modify(struct g_part_table *, struct g_part_entry *,
struct g_part_parms *);
static const char *g_part_bsd_name(struct g_part_table *, struct g_part_entry *,
char *, size_t);
@@ -256,7 +256,7 @@ g_part_bsd_destroy(struct g_part_table *basetable, struct g_part_parms *gpp)
}
static void
-g_part_bsd_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
+g_part_bsd_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
struct sbuf *sb, const char *indent)
{
struct g_part_bsd_entry *entry;
@@ -275,7 +275,7 @@ g_part_bsd_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
}
static int
-g_part_bsd_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
+g_part_bsd_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
{
struct g_part_bsd_entry *entry;
@@ -471,7 +471,7 @@ g_part_bsd_read(struct g_part_table *basetable, struct g_consumer *cp)
}
static const char *
-g_part_bsd_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_bsd_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
char *buf, size_t bufsz)
{
struct g_part_bsd_entry *entry;
diff --git a/sys/geom/part/g_part_bsd64.c b/sys/geom/part/g_part_bsd64.c
index 8b2777decd088..d1a65e238a31c 100644
--- a/sys/geom/part/g_part_bsd64.c
+++ b/sys/geom/part/g_part_bsd64.c
@@ -127,7 +127,7 @@ static int g_part_bsd64_destroy(struct g_part_table *, struct g_part_parms *);
static void g_part_bsd64_dumpconf(struct g_part_table *, struct g_part_entry *,
struct sbuf *, const char *);
static int g_part_bsd64_dumpto(struct g_part_table *, struct g_part_entry *);
-static int g_part_bsd64_modify(struct g_part_table *, struct g_part_entry *,
+static int g_part_bsd64_modify(struct g_part_table *, struct g_part_entry *,
struct g_part_parms *);
static const char *g_part_bsd64_name(struct g_part_table *, struct g_part_entry *,
char *, size_t);
@@ -409,7 +409,7 @@ g_part_bsd64_dumpconf(struct g_part_table *basetable,
}
static int
-g_part_bsd64_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
+g_part_bsd64_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
{
struct g_part_bsd64_entry *entry;
@@ -577,7 +577,7 @@ invalid_label:
}
static const char *
-g_part_bsd64_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_bsd64_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
char *buf, size_t bufsz)
{
struct g_part_bsd64_entry *entry;
diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c
index 658b6ef495cb2..f0a7fd2a15386 100644
--- a/sys/geom/part/g_part_ebr.c
+++ b/sys/geom/part/g_part_ebr.c
@@ -80,7 +80,7 @@ static int g_part_ebr_dumpto(struct g_part_table *, struct g_part_entry *);
static void g_part_ebr_fullname(struct g_part_table *, struct g_part_entry *,
struct sbuf *, const char *);
#endif
-static int g_part_ebr_modify(struct g_part_table *, struct g_part_entry *,
+static int g_part_ebr_modify(struct g_part_table *, struct g_part_entry *,
struct g_part_parms *);
static const char *g_part_ebr_name(struct g_part_table *, struct g_part_entry *,
char *, size_t);
@@ -322,11 +322,11 @@ g_part_ebr_destroy(struct g_part_table *basetable, struct g_part_parms *gpp)
}
static void
-g_part_ebr_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
+g_part_ebr_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
struct sbuf *sb, const char *indent)
{
struct g_part_ebr_entry *entry;
-
+
entry = (struct g_part_ebr_entry *)baseentry;
if (indent == NULL) {
/* conftxt: libdisk compatibility */
@@ -343,7 +343,7 @@ g_part_ebr_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
}
static int
-g_part_ebr_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
+g_part_ebr_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
{
struct g_part_ebr_entry *entry;
@@ -595,7 +595,7 @@ g_part_ebr_setunset(struct g_part_table *table, struct g_part_entry *baseentry,
}
static const char *
-g_part_ebr_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_ebr_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
char *buf, size_t bufsz)
{
struct g_part_ebr_entry *entry;
@@ -667,7 +667,7 @@ g_part_ebr_write(struct g_part_table *basetable, struct g_consumer *cp)
p[7] = entry->ent.dp_ecyl;
le32enc(p + 8, entry->ent.dp_start);
le32enc(p + 12, entry->ent.dp_size);
-
+
next = LIST_NEXT(baseentry, gpe_entry);
while (next != NULL && next->gpe_deleted)
next = LIST_NEXT(next, gpe_entry);
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index e34384e98605f..b007acef3e814 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -699,11 +699,11 @@ g_part_gpt_destroy(struct g_part_table *basetable, struct g_part_parms *gpp)
}
static void
-g_part_gpt_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
+g_part_gpt_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
struct sbuf *sb, const char *indent)
{
struct g_part_gpt_entry *entry;
-
+
entry = (struct g_part_gpt_entry *)baseentry;
if (indent == NULL) {
/* conftxt: libdisk compatibility */
@@ -743,7 +743,7 @@ g_part_gpt_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry,
}
static int
-g_part_gpt_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
+g_part_gpt_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
{
struct g_part_gpt_entry *entry;
@@ -866,7 +866,7 @@ g_part_gpt_probe(struct g_part_table *table, struct g_consumer *cp)
&error);
if (buf == NULL)
return (error);
- res = memcmp(buf, GPT_HDR_SIG, 8);
+ res = memcmp(buf, GPT_HDR_SIG, 8);
g_free(buf);
return ((res == 0) ? pri : ENXIO);
}
@@ -1108,13 +1108,13 @@ g_part_gpt_setunset(struct g_part_table *basetable,
}
static const char *
-g_part_gpt_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_gpt_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
char *buf, size_t bufsz)
{
struct g_part_gpt_entry *entry;
struct uuid *type;
struct g_part_uuid_alias *uap;
-
+
entry = (struct g_part_gpt_entry *)baseentry;
type = &entry->ent.ent_type;
for (uap = &gpt_uuid_alias_match[0]; uap->uuid; uap++)
diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c
index feb96992c5b77..4cbd6a96eb224 100644
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
@@ -77,7 +77,7 @@ static int g_part_mbr_destroy(struct g_part_table *, struct g_part_parms *);
static void g_part_mbr_dumpconf(struct g_part_table *, struct g_part_entry *,
struct sbuf *, const char *);
static int g_part_mbr_dumpto(struct g_part_table *, struct g_part_entry *);
-static int g_part_mbr_modify(struct g_part_table *, struct g_part_entry *,
+static int g_part_mbr_modify(struct g_part_table *, struct g_part_entry *,
struct g_part_parms *);
static const char *g_part_mbr_name(struct g_part_table *, struct g_part_entry *,
char *, size_t);
@@ -303,13 +303,13 @@ g_part_mbr_destroy(struct g_part_table *basetable, struct g_part_parms *gpp)
}
static void
-g_part_mbr_dumpconf(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_mbr_dumpconf(struct g_part_table *basetable, struct g_part_entry *baseentry,
struct sbuf *sb, const char *indent)
{
struct g_part_mbr_entry *entry;
struct g_part_mbr_table *table;
uint32_t dsn;
-
+
table = (struct g_part_mbr_table *)basetable;
entry = (struct g_part_mbr_entry *)baseentry;
if (indent == NULL) {
@@ -332,7 +332,7 @@ g_part_mbr_dumpconf(struct g_part_table *basetable, struct g_part_entry *baseent
}
static int
-g_part_mbr_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
+g_part_mbr_dumpto(struct g_part_table *table, struct g_part_entry *baseentry)
{
struct g_part_mbr_entry *entry;
@@ -560,7 +560,7 @@ g_part_mbr_setunset(struct g_part_table *table, struct g_part_entry *baseentry,
}
static const char *
-g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
+g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
char *buf, size_t bufsz)
{
struct g_part_mbr_entry *entry;