From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 21 Aug 2022 10:46:31 +0000 (+0200)
Subject: Rename blkpg functions
X-Git-Tag: v14~61^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc3cf613467c9d6fd95612dd3c57cdec31932b82;p=thirdparty%2Fmkosi.git

Rename blkpg functions

Let's rename these to be named after the operation they execute
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 892683b86..d674f240f 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -106,7 +106,7 @@ from .backend import (
     write_grub_config,
 )
 from .manifest import Manifest
-from .syscall import ioctl_partition_add, ioctl_partition_remove, reflink
+from .syscall import blkpg_add_partition, blkpg_del_partition, reflink
 
 complete_step = MkosiPrinter.complete_step
 
@@ -959,7 +959,7 @@ def attach_image_loopback(image: Optional[BinaryIO], table: Optional[PartitionTa
         # the BLKPKG BLKPG_ADD_PARTITION ioctl().
         with open(loopdev, 'rb+') as f:
             for p in table.partitions.values():
-                ioctl_partition_add(f.fileno(), p.number, table.partition_offset(p), table.partition_size(p))
+                blkpg_add_partition(f.fileno(), p.number, table.partition_offset(p), table.partition_size(p))
 
     try:
         yield loopdev
@@ -969,7 +969,7 @@ def attach_image_loopback(image: Optional[BinaryIO], table: Optional[PartitionTa
             # avoid race conditions by explicitly removing all partition devices before detaching the loop
             # device using the BLKPG BLKPG_DEL_PARTITION ioctl().
             for p in table.partitions.values():
-                ioctl_partition_remove(f.fileno(), p.number)
+                blkpg_del_partition(f.fileno(), p.number)
 
             run(["losetup", "--detach", loopdev])
 
diff --git a/mkosi/backend.py b/mkosi/backend.py
index 6ea3f8afa..6b3e42791 100644
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -37,7 +37,7 @@ from typing import (
     cast,
 )
 
-from .syscall import ioctl_partition_add, ioctl_partition_remove
+from .syscall import blkpg_add_partition, blkpg_del_partition
 
 PathString = Union[Path, str]
 
@@ -414,7 +414,7 @@ class PartitionTable:
             with open(device, 'rb+') as f:
                 for p in self.partitions.values():
                     try:
-                        ioctl_partition_remove(f.fileno(), p.number)
+                        blkpg_del_partition(f.fileno(), p.number)
                     except OSError as e:
                         if e.errno != errno.ENXIO:
                             raise
@@ -431,7 +431,7 @@ class PartitionTable:
             # Make sure we re-add all partitions after modifying the partition table.
             with open(device, 'rb+') as f:
                 for p in self.partitions.values():
-                    ioctl_partition_add(f.fileno(), p.number, self.partition_offset(p), self.partition_size(p))
+                    blkpg_add_partition(f.fileno(), p.number, self.partition_offset(p), self.partition_size(p))
 
 
 @dataclasses.dataclass
diff --git a/mkosi/syscall.py b/mkosi/syscall.py
index f7cfce271..e3f364f11 100644
--- a/mkosi/syscall.py
+++ b/mkosi/syscall.py
@@ -57,7 +57,7 @@ class blkpg_partition(ctypes.Structure):
     ]
 
 
-def ioctl_partition_add(fd: int, nr: int, start: int, size: int) -> None:
+def blkpg_add_partition(fd: int, nr: int, start: int, size: int) -> None:
     bp = blkpg_partition(pno=nr, start=start, length=size)
     ba = blkpg_ioctl_arg(op=BLKPG_ADD_PARTITION, data=ctypes.addressof(bp), datalen=ctypes.sizeof(bp))
     try:
@@ -68,7 +68,7 @@ def ioctl_partition_add(fd: int, nr: int, start: int, size: int) -> None:
             raise
 
 
-def ioctl_partition_remove(fd: int, nr: int) -> None:
+def blkpg_del_partition(fd: int, nr: int) -> None:
     bp = blkpg_partition(pno=nr)
     ba = blkpg_ioctl_arg(op=BLKPG_DEL_PARTITION, data=ctypes.addressof(bp), datalen=ctypes.sizeof(bp))
     try: