diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2019-12-05 15:07:32 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2019-12-05 15:07:32 +0000 |
| commit | c4c88d4718ff26fda74343e189c0b9ab0b3c9133 (patch) | |
| tree | ed142359395cdb0d13ee1b4da0eee2b1711577a5 /sys/geom/part | |
| parent | befd3e35b3765472e4c29dbad6201b4ad7d32ef1 (diff) | |
| download | src-c4c88d4718ff26fda74343e189c0b9ab0b3c9133.tar.gz src-c4c88d4718ff26fda74343e189c0b9ab0b3c9133.zip | |
Remove duplicate g_debugflags declaration.
While there, define G_F_FOOTSHOOTING instead of numeric constants.
MFC after: 13 days
X-MFX-with: r355412
Notes
Notes:
svn path=/head/; revision=355420
Diffstat (limited to 'sys/geom/part')
| -rw-r--r-- | sys/geom/part/g_part.c | 2 | ||||
| -rw-r--r-- | sys/geom/part/g_part_mbr.c | 2 | ||||
| -rw-r--r-- | sys/geom/part/g_part_vtoc8.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 583fa190f9f8..70cc4df6cc6c 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -1383,7 +1383,7 @@ g_part_ctl_resize(struct gctl_req *req, struct g_part_parms *gpp) } pp = entry->gpe_pp; - if ((g_debugflags & 16) == 0 && + if ((g_debugflags & G_F_FOOTSHOOTING) == 0 && (pp->acr > 0 || pp->acw > 0 || pp->ace > 0)) { if (entry->gpe_end - entry->gpe_start + 1 > gpp->gpp_size) { /* Deny shrinking of an opened partition. */ diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c index 013b2a934ccc..720872257e32 100644 --- a/sys/geom/part/g_part_mbr.c +++ b/sys/geom/part/g_part_mbr.c @@ -381,7 +381,7 @@ g_part_mbr_resize(struct g_part_table *basetable, return (EINVAL); /* XXX: prevent unexpected shrinking. */ pp = baseentry->gpe_pp; - if ((g_debugflags & 0x10) == 0 && size < gpp->gpp_size && + if ((g_debugflags & G_F_FOOTSHOOTING) == 0 && size < gpp->gpp_size && pp->mediasize / pp->sectorsize > size) return (EBUSY); entry = (struct g_part_mbr_entry *)baseentry; diff --git a/sys/geom/part/g_part_vtoc8.c b/sys/geom/part/g_part_vtoc8.c index 8f238a3a6400..7b595cb14598 100644 --- a/sys/geom/part/g_part_vtoc8.c +++ b/sys/geom/part/g_part_vtoc8.c @@ -373,7 +373,7 @@ g_part_vtoc8_resize(struct g_part_table *basetable, return (EINVAL); /* XXX: prevent unexpected shrinking. */ pp = entry->gpe_pp; - if ((g_debugflags & 0x10) == 0 && size < gpp->gpp_size && + if ((g_debugflags & G_F_FOOTSHOOTING) == 0 && size < gpp->gpp_size && pp->mediasize / pp->sectorsize > size) return (EBUSY); entry->gpe_end = entry->gpe_start + size - 1; |