lomount: accomodate building with loopdev

index 64df339..1700983 100644
@@ -25,13 +25,6 @@
 /* #define LOOP_CHANGE_FD	0x4C06 */
 #define LOOP_SET_CAPACITY	0x4C07
 
-/* Flags for loop_into{64,}->lo_flags */
-enum {
-	LO_FLAGS_READ_ONLY  = 1,
-	LO_FLAGS_USE_AOPS   = 2,
-	LO_FLAGS_AUTOCLEAR  = 4, /* New in 2.6.25 */
-};
-
 #define LO_NAME_SIZE	64
 #define LO_KEY_SIZE	32
 

@@ -50,20 +43,4 @@ struct loop_info {
 	char		reserved[4];
 };
 
-struct loop_info64 {
-	uint64_t	lo_device;
-	uint64_t	lo_inode;
-	uint64_t	lo_rdevice;
-	uint64_t	lo_offset;
-	uint64_t	lo_sizelimit; /* bytes, 0 == max available */
-	uint32_t	lo_number;
-	uint32_t	lo_encrypt_type;
-	uint32_t	lo_encrypt_key_size;
-	uint32_t	lo_flags;
-	uint8_t		lo_file_name[LO_NAME_SIZE];
-	uint8_t		lo_crypt_name[LO_NAME_SIZE];
-	uint8_t		lo_encrypt_key[LO_KEY_SIZE];
-	uint64_t	lo_init[2];
-};
-
 #endif /* MNT_LOOP_H */

index 74a8749..781cdd1 100644
@@ -18,6 +18,7 @@
 
 #include "loop.h"
 #include "lomount.h"
+#include "loopdev.h"
 #include "strutils.h"
 #include "nls.h"
 #include "sundries.h"

@@ -699,35 +700,20 @@ loopfile_used_with(char *devname, const char *filename, unsigned long long offse
 
 char *
 find_unused_loop_device (void) {
-	struct looplist ll;
-	char *devname = NULL;
-	int fd;
+	struct loopdev_cxt lc;
+	char *dev;
+	int rc;
 
-	if (looplist_open(&ll, LLFLG_FREEONLY) == -1) {
-		error(_("%s: /dev directory does not exist."), progname);
-		return NULL;
-	}
+	loopcxt_init(&lc, 0);
 
-	if ((fd = looplist_next(&ll)) != -1) {
-		close(fd);
-		devname = xstrdup(ll.name);
-	}
-	looplist_close(&ll);
-	if (devname)
-		return devname;
+	rc = loopcxt_find_unused(&lc);
+	if (rc)
+		err(EXIT_FAILURE, "loopdevs scanning failed");
+	
+	dev = xstrdup(loopcxt_get_device(&lc));
+	loopcxt_deinit(&lc);
 
-	if (!ll.ct_succ && ll.ct_perm)
-		error(_("%s: no permission to look at /dev/loop%s<N>"), progname,
-				(ll.flag & LLFLG_SUBDIR) ? "/" : "");
-	else if (ll.ct_succ)
-		error(_("%s: could not find any free loop device"), progname);
-	else
-		error(_(
-		    "%s: Could not find any loop device. Maybe this kernel "
-		    "does not know\n"
-		    "       about the loop device? (If so, recompile or "
-		    "`modprobe loop'.)"), progname);
-	return NULL;
+	return dev;
 }
 
 /*

index 781cdd1..9605bd1 100644
@@ -137,15 +137,6 @@ char *loopdev_get_loopfile(const char *device)
 	return res;
 }
 
-int
-is_loop_device (const char *device) {
-	struct stat st;
-
-	return (stat(device, &st) == 0 &&
-		S_ISBLK(st.st_mode) &&
-		major(st.st_rdev) == LOOPMAJOR);
-}
-
 static int
 is_loop_used(int fd)
 {

@@ -683,7 +674,7 @@ loopfile_used_with(char *devname, const char *filename, unsigned long long offse
 	struct stat statbuf;
 	int fd, ret;
 
-	if (!is_loop_device(devname))
+	if (!is_loopdev(devname))
 		return 0;
 
 	if (stat(filename, &statbuf) == -1)

index 4acc371..eae12d9 100644
@@ -4,7 +4,6 @@
 extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 		    const char *, int, int *);
 extern int del_loop(const char *);
-extern int is_loop_device(const char *);
 extern int is_loop_autoclear(const char *device);
 extern char * find_unused_loop_device(void);
 

index 5000aa5..efd3a4e 100644
@@ -22,6 +22,7 @@
 #include "env.h"
 #include "nls.h"
 #include "strutils.h"
+#include "loopdev.h"
 
 #if defined(MNT_FORCE)
 /* Interesting ... it seems libc knows about MNT_FORCE and presumably

@@ -301,7 +302,7 @@ umount_one (const char *spec, const char *node, const char *type,
 	 * Ignore the option "-d" for non-loop devices and loop devices with
 	 * LO_FLAGS_AUTOCLEAR flag.
 	 */
-	if (delloop && is_loop_device(spec))
+	if (delloop && is_loopdev(spec))
 		myloop = 1;
 
 	if (restricted) {

index 9605bd1..55fb7ba 100644
@@ -918,27 +918,22 @@ set_loop(const char *device, const char *file, unsigned long long offset,
 
 int
 del_loop (const char *device) {
-	int fd, errsv;
+	struct loopdev_cxt lc;
+	int rc;
 
-	if ((fd = open (device, O_RDONLY)) < 0) {
-		errsv = errno;
-		goto error;
-	}
-	if (ioctl (fd, LOOP_CLR_FD, 0) < 0) {
-		errsv = errno;
-		goto error;
-	}
-	close (fd);
-	if (verbose > 1)
-		printf(_("del_loop(%s): success\n"), device);
-	return 0;
+	loopcxt_init(&lc, 0);
+	rc = loopcxt_set_device(&lc, device);
+	if (rc)
+		err(EXIT_FAILURE, "failed to set device: %s", device);
 
-error:
-	fprintf(stderr, _("loop: can't delete device %s: %s\n"),
-		 device, strerror(errsv));
-	if (fd >= 0)
-		close(fd);
-	return 1;
+	rc = loopcxt_delete_device(&lc);
+	if (rc)
+		warnx(_("loop: can't delete device %s"), device);
+	if (verbose && !rc)
+		printf(_("del_loop(%s): success\n"), device);
+	
+	loopcxt_deinit(&lc);
+	return rc;
 }
 
 #else /* no LOOP_SET_FD defined */