a/an fixups
Andre Beaud <[email protected]> Sun, 6 Jul 2025 01:03:03 +1000
| Newsgroups | gmane.linux.lvm.devel |
|---|---|
| Message-ID | <[email protected]> |
Hi lvm-devel,
When looking through some output today from lvdisplay -vv, I came across
a bit language that needed looking at - something like
"Adding some/path:6781 as an user of ..."
After some grepping this led me to some a/an fixups along with a couple
more odds and ends. Hopefully this is useful like this as plain diff
output, or let me know if something else will work better.
Best regards,
Andre
--- lvm2/daemons/lvmdbusd/objectmanager.py 2025-07-05
23:34:01.908129751 +1000
+++ lvm2/daemons/lvmdbusd/objectmanager.py.new 2025-07-06
00:14:30.153210604 +1000
@@ -272,7 +272,7 @@
For a given lvm asset return the dbus object path
registered for it.
This method first looks up by uuid and then by lvm_id. You
can search by just one by setting uuid == lvm_id (uuid
or lvm_id).
- If the object is not found and path_create is a not
None, the
+ If the object is not found and path_create is not None, the
path_create function will be called to create a new
object path and
register it with the object manager for the specified
uuid & lvm_id.
Note: If path create is not None, uuid and lvm_id
cannot be equal
@@ -295,7 +295,7 @@
if uuid == lvm_id:
path = self._id_lookup(lvm_id)
else:
- # We have an uuid and a lvm_id we can do
sanity checks to ensure
+ # We have an uuid and an lvm_id, we can
do sanity checks to ensure
# that they are consistent
# If a PV is missing its device path is
'[unknown]' or some
--- lvm2/lib/metadata/lv_manip.c 2025-07-05 23:34:01.943130033 +1000
+++ lvm2/lib/metadata/lv_manip.c.new 2025-07-05 23:47:12.268598449 +1000
@@ -884,7 +884,7 @@
}
}
- log_very_verbose("Adding %s:" FMTu32 " as an user of %s.",
+ log_very_verbose("Adding %s:" FMTu32 " as a user of %s.",
seg->lv->name, seg->le, lv->name);
if (!(sl = dm_pool_zalloc(lv->vg->vgmem, sizeof(*sl)))) {
--- lvm2/doc/release-notes/2.03.24.mdwn 2025-07-05 23:34:01.923129872 +1000
+++ lvm2/doc/release-notes/2.03.24.mdwn.new 2025-07-06
00:16:27.441178429 +1000
@@ -22,7 +22,7 @@
* **IMPORTANT:** When `devices/scan_lvs` is enabled found LVs are no
longer auto
activated, must enable `LVM_PVSCAN_ON_LVS` in udev rules
(*69-dm-lvm.rules*.)
- * NOTE: It is not recommended to use LVs for PVs. If you have an
use case for
+ * NOTE: It is not recommended to use LVs for PVs. If you have a use
case for
this talk to us, please.
* Changes to devices file are now backed up in */etc/lvm/devices/backup/*.
Controlled by `devices/devicesfile_backup_limit` configuration option.
--- lvm2/udev/10-dm.rules.in 2025-07-05 23:34:02.040130813 +1000
+++ lvm2/udev/10-dm.rules.in.new 2025-07-06 00:17:23.977636441 +1000
@@ -86,7 +86,7 @@
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="$env{DM_COOKIE_DISABLE_OTHER_RULES_FLAG}"
LABEL="dm_flags_done"
-# If DISK_RO is set, it's an uevent that changes the ro attribute of
the device.
+# If DISK_RO is set, it's a uevent that changes the ro attribute of the
device.
# The event should be ignored as far as dm is concerned.
ENV{DISK_RO}=="0|1", GOTO="dm_disable"
--- lvm2/lib/device/device_id.c 2025-07-05 23:34:01.933129953 +1000
+++ lvm2/lib/device/device_id.c.new 2025-07-06 00:17:50.827853950 +1000
@@ -2763,7 +2763,7 @@
* a device, is allowed to read a device to evaluate filters that need
to see
* data from the dev.
*
- * When a device id of a particular type is obtained for a dev, a id
for that
+ * When a device id of a particular type is obtained for a dev, an id
for that
* type is saved in dev->ids in case it needs to be checked again.
*
* When a device in dev-cache is matched to an entry in the devices file
--- lvm2/lib/metadata/merge.c 2025-07-05 23:34:01.943130033 +1000
+++ lvm2/lib/metadata/merge.c.new 2025-07-06 00:18:31.846186242 +1000
@@ -523,7 +523,7 @@
if (seg->external_lv &&
!lv_is_external_origin(seg->external_lv))
- seg_error("external LV is not flagged as a
external origin LV");
+ seg_error("external LV is not flagged as an
external origin LV");
if (seg->merge_lv) {
if (!lv_is_thin_volume(seg->merge_lv))