From: wguanghao <wuguanghao3@huawei.com>
Date: Mon, 22 Sep 2025 14:37:57 +0000 (+0800)
Subject: losetup: rename function *_delete_* to *_detach_*
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aacb1c114169491b7b4ff3b75d85dd3255e4d0fb;p=thirdparty%2Futil-linux.git

losetup: rename function *_delete_* to *_detach_*

Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
---

diff --git a/include/loopdev.h b/include/loopdev.h
index ec57a8c2f..396ade264 100644
--- a/include/loopdev.h
+++ b/include/loopdev.h
@@ -160,7 +160,7 @@ extern int loopdev_is_used(const char *device, const char *filename,
 extern char *loopdev_find_by_backing_file(const char *filename,
 				uint64_t offset, uint64_t sizelimit, int flags);
 extern int loopcxt_find_unused(struct loopdev_cxt *lc);
-extern int loopdev_delete(const char *device);
+extern int loopdev_detach(const char *device);
 extern int loopdev_count_by_backing_file(const char *filename, char **loopdev);
 
 /*
@@ -185,7 +185,7 @@ extern int loopcxt_deinit_iterator(struct loopdev_cxt *lc);
 extern int loopcxt_next(struct loopdev_cxt *lc);
 
 extern int loopcxt_setup_device(struct loopdev_cxt *lc);
-extern int loopcxt_delete_device(struct loopdev_cxt *lc);
+extern int loopcxt_detach_device(struct loopdev_cxt *lc);
 
 extern int loopcxt_ioctl_status(struct loopdev_cxt *lc);
 extern int loopcxt_ioctl_capacity(struct loopdev_cxt *lc);
diff --git a/lib/loopdev.c b/lib/loopdev.c
index 8a51e5e5f..4836a3ab5 100644
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -1603,14 +1603,14 @@ int loopcxt_ioctl_blocksize(struct loopdev_cxt *lc, uint64_t blocksize)
 	return 0;
 }
 
-int loopcxt_delete_device(struct loopdev_cxt *lc)
+int loopcxt_detach_device(struct loopdev_cxt *lc)
 {
 	int rc, fd = loopcxt_get_fd(lc);
 
 	if (fd < 0)
 		return -EINVAL;
 
-	DBG(SETUP, ul_debugobj(lc, "calling LOOP_SET_CLR_FD"));
+	DBG(SETUP, ul_debugobj(lc, "calling LOOP_CLR_FD"));
 
 	rc = repeat_on_eagain( ioctl(fd, LOOP_CLR_FD, 0) );
 	if (rc != 0) {
@@ -1786,7 +1786,7 @@ int loopdev_is_used(const char *device, const char *filename,
 /*
  * Returns: 0 = success, < 0 error
  */
-int loopdev_delete(const char *device)
+int loopdev_detach(const char *device)
 {
 	struct loopdev_cxt lc;
 	int rc;
@@ -1798,7 +1798,7 @@ int loopdev_delete(const char *device)
 	if (!rc)
 		rc = loopcxt_set_device(&lc, device);
 	if (!rc)
-		rc = loopcxt_delete_device(&lc);
+		rc = loopcxt_detach_device(&lc);
 	loopcxt_deinit(&lc);
 	return rc;
 }
diff --git a/libmount/src/hook_loopdev.c b/libmount/src/hook_loopdev.c
index 444d69d6f..b72164535 100644
--- a/libmount/src/hook_loopdev.c
+++ b/libmount/src/hook_loopdev.c
@@ -398,7 +398,7 @@ static int delete_loopdev(struct libmnt_context *cxt, struct hook_data *hd)
 		hd->loopdev_fd = -1;
 	}
 
-	rc = loopdev_delete(src);	/* see lib/loopdev.c */
+	rc = loopdev_detach(src);	/* see lib/loopdev.c */
 
 	DBG(LOOP, ul_debugobj(cxt, "deleted [rc=%d]", rc));
 	return rc;
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index f35bd79fc..efda75c03 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -38,8 +38,8 @@
 
 enum {
 	A_CREATE = 1,		/* setup a new device */
-	A_DELETE,		/* delete given device(s) */
-	A_DELETE_ALL,		/* delete all devices */
+	A_DETACH,		/* detach given device(s) */
+	A_DETACH_ALL,		/* detach all devices */
 	A_SHOW,			/* list devices */
 	A_SHOW_ONE,		/* print info about one device */
 	A_FIND_FREE,		/* find first unused */
@@ -233,9 +233,9 @@ static void warn_lost(struct loopdev_cxt *lc)
 			loopcxt_get_device(lc), major(devno), minor(devno));
 }
 
-static int delete_loop(struct loopdev_cxt *lc)
+static int detach_loop(struct loopdev_cxt *lc)
 {
-	if (loopcxt_delete_device(lc)) {
+	if (loopcxt_detach_device(lc)) {
 		warn(_("%s: detach failed"), loopcxt_get_device(lc));
 		if (loopcxt_is_lost(lc))
 			warn_lost(lc);
@@ -245,7 +245,7 @@ static int delete_loop(struct loopdev_cxt *lc)
 	return -1;
 }
 
-static int delete_all_loops(struct loopdev_cxt *lc)
+static int detach_all_loops(struct loopdev_cxt *lc)
 {
 	int res = 0;
 
@@ -253,7 +253,7 @@ static int delete_all_loops(struct loopdev_cxt *lc)
 		return -1;
 
 	while (loopcxt_next(lc) == 0)
-		res += delete_loop(lc);
+		res += detach_loop(lc);
 
 	loopcxt_deinit_iterator(lc);
 	return res;
@@ -766,13 +766,13 @@ int main(int argc, char **argv)
 			refname = optarg;
 			break;
 		case 'd':
-			act = A_DELETE;
+			act = A_DETACH;
 			if (loopcxt_set_device(&lc, optarg))
 				err(EXIT_FAILURE, _("%s: failed to use device"),
 						optarg);
 			break;
 		case 'D':
-			act = A_DELETE_ALL;
+			act = A_DETACH_ALL;
 			break;
 		case 'f':
 			act = A_FIND_FREE;
@@ -833,6 +833,7 @@ int main(int argc, char **argv)
 			usage();
 		case 'V':
 			print_version(EXIT_SUCCESS);
+
 		default:
 			errtryhelp(EXIT_FAILURE);
 		}
@@ -943,18 +944,18 @@ int main(int argc, char **argv)
 			warn_size(file, sizelimit, offset, flags);
 		}
 		break;
-	case A_DELETE:
-		res = delete_loop(&lc);
+	case A_DETACH:
+		res = detach_loop(&lc);
 		while (optind < argc) {
 			if (loopcxt_set_device(&lc, argv[optind]))
 				warn(_("%s: failed to use device"),
 						argv[optind]);
 			optind++;
-			res += delete_loop(&lc);
+			res += detach_loop(&lc);
 		}
 		break;
-	case A_DELETE_ALL:
-		res = delete_all_loops(&lc);
+	case A_DETACH_ALL:
+		res = detach_all_loops(&lc);
 		break;
 	case A_FIND_FREE:
 		res = find_unused(&lc);