hfs-556.100.11.tar.gz

[apple/hfs.git] / tests / cases / test-external-jnl.c

diff --git a/tests/cases/test-external-jnl.c b/tests/cases/test-external-jnl.c
index 6b862368e1d88e5b49328606e830ea6919b57b55..c5542b22c7c76276454f30249b1abbf549b887b6 100644 (file)
--- a/tests/cases/test-external-jnl.c
+++ b/tests/cases/test-external-jnl.c
@@ -23,41 +23,45 @@
 #include "../core/hfs_format.h"
 #include "test-utils.h"
 
-#define DISK_IMAGE_1           "/tmp/external-jnl1.sparseimage"
-#define DISK_IMAGE_2           "/tmp/external-jnl2.sparseimage"
+#define HOST_IMAGE                     "/tmp/external-jnl1.sparseimage"
+#define EXTERNAL_IMAGE "/tmp/external-jnl2.sparseimage"
 
 TEST(external_jnl)
 
 int run_external_jnl(__unused test_ctx_t *ctx)
 {
-       unlink(DISK_IMAGE_1);
-       unlink(DISK_IMAGE_2);
-
-       disk_image_t *di1 = disk_image_create(DISK_IMAGE_1,
-                                                                                 &(disk_image_opts_t){
-                                                                                         .size = 64 * 1024 * 1024
-                                                                                 });
-       disk_image_t *di2
-               = disk_image_create(DISK_IMAGE_2,
+       unlink(HOST_IMAGE);
+       unlink(EXTERNAL_IMAGE);
+
+       /* Since disk image cleanup occurs on a stack, create the external
+        * journal partition first so that the cleanup of the host image
+        * prevents a resource busy error during the journal partition ejection.
+        */
+       disk_image_t *di_ext = disk_image_create(EXTERNAL_IMAGE,
                                                        &(disk_image_opts_t){
                                                                .partition_type = EXTJNL_CONTENT_TYPE_UUID,
                                                                .size = 8 * 1024 * 1024
                                                        });
 
-       unmount(di1->mount_point, 0);
+       disk_image_t *di_host = disk_image_create(HOST_IMAGE,
+                                                       &(disk_image_opts_t){
+                                                               .size = 64 * 1024 * 1024
+                                                       });
+
+       unmount(di_host->mount_point, 0);
 
-       assert(!systemx("/sbin/newfs_hfs", SYSTEMX_QUIET, "-J", "-D", di2->disk, di1->disk, NULL));
+       assert(!systemx("/sbin/newfs_hfs", SYSTEMX_QUIET, "-J", "-D", di_ext->disk, di_host->disk, NULL));
 
-       assert(!systemx("/usr/sbin/diskutil", SYSTEMX_QUIET, "mount", di1->disk, NULL));
+       assert(!systemx("/usr/sbin/diskutil", SYSTEMX_QUIET, "mount", di_host->disk, NULL));
 
-       free((char *)di1->mount_point);
-       di1->mount_point = NULL;
+       free((char *)di_host->mount_point);
+       di_host->mount_point = NULL;
 
        struct statfs *mntbuf;
        int i, n = getmntinfo(&mntbuf, 0);
        for (i = 0; i < n; ++i) {
-               if (!strcmp(mntbuf[i].f_mntfromname, di1->disk)) {
-                       di1->mount_point = strdup(mntbuf[i].f_mntonname);
+               if (!strcmp(mntbuf[i].f_mntfromname, di_host->disk)) {
+                       di_host->mount_point = strdup(mntbuf[i].f_mntonname);
                        break;
                }
        }
@@ -65,7 +69,7 @@ int run_external_jnl(__unused test_ctx_t *ctx)
        assert(i < n);
 
        char *path;
-       asprintf(&path, "%s/test", di1->mount_point);
+       asprintf(&path, "%s/test", di_host->mount_point);
        int fd = open(path, O_RDWR | O_CREAT, 0666);
        assert_with_errno(fd >= 0);
        assert_no_err(close(fd));