Store DADiskRef for every mounted volume

configure.ac

@@ -76,6 +76,9 @@ AC_ARG_WITH([libiconv-prefix],
 AM_ICONV
 libfuse_libs="$libfuse_libs $LTLIBICONV"
 AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
+if test "$arch" = darwin; then
+    libfuse_libs="$libfuse_libs -framework CoreFoundation -framework DiskArbitration"
+fi
 AC_SUBST(libfuse_libs)
 
 if test -z "$MOUNT_FUSE_PATH"; then

lib/fuse_darwin.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2006-2008 Amit Singh/Google Inc.
  * Copyright (c) 2012 Anatol Pomozov
- * Copyright (c) 2011-2016 Benjamin Fleischer
+ * Copyright (c) 2011-2017 Benjamin Fleischer
  */
 
 #include "fuse_i.h"
@@ -20,6 +20,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <CoreFoundation/CoreFoundation.h>
+
 /*
  * Semaphore implementation based on:
  *
@@ -367,6 +369,8 @@ fuse_remove_signal_handlers_internal_np(void)
 
 /********************/
 
+DASessionRef fuse_dasession;
+
 pthread_mutex_t mount_lock;
 hash_table     *mount_hash;
 int             mount_count;
@@ -378,6 +382,8 @@ static void fuse_lib_destructor(void)  __attribute__((destructor));
 static void
 fuse_lib_constructor(void)
 {
+	fuse_dasession = DASessionCreate(NULL);
+
 	pthread_mutex_init(&mount_lock, NULL);
 	mount_hash = hash_create(OSXFUSE_NDEVICES);
 	mount_count = 0;
@@ -398,4 +404,7 @@ fuse_lib_destructor(void)
 	free(mount_hash);
 	mount_hash = NULL;
 	mount_count = 0;
+
+	CFRelease(fuse_dasession);
+	fuse_dasession = NULL;
 }

lib/fuse_darwin_private.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006-2008 Amit Singh/Google Inc.
- * Copyright (c) 2011-2016 Benjamin Fleischer
+ * Copyright (c) 2011-2017 Benjamin Fleischer
  */
 
 #ifdef __APPLE__
@@ -24,15 +24,16 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 #include <time.h>
-
+
+#include <DiskArbitration/DiskArbitration.h>
+
 #ifdef __cplusplus
 }
 #endif
 
 /* Semaphores */
 
-struct __local_sem_t
-{
+struct __local_sem_t {
 	unsigned int    count;
 	pthread_mutex_t count_lock;
 	pthread_cond_t  count_cond;
@@ -87,6 +88,8 @@ void fuse_exit_handler_internal_np(void);
 
 int fuse_remove_signal_handlers_internal_np(void);
 
+extern DASessionRef fuse_dasession;
+
 /*
  * The mount_hash maps char* mountpoint -> struct mount_info. It is protected
  * by the mount_lock mutex, which is held across a mount operation.

lib/fuse_i.h

@@ -6,9 +6,17 @@
   See the file COPYING.LIB
 */
 
+/*
+ * Copyright (c) 2017 Benjamin Fleischer
+ */
+
 #include "fuse.h"
 #include "fuse_lowlevel.h"
 
+#ifdef __APPLE__
+#  include <DiskArbitration/DiskArbitration.h>
+#endif
+
 struct fuse_chan;
 struct fuse_ll;
 
@@ -106,6 +114,12 @@ struct fuse_session *fuse_lowlevel_new_common(struct fuse_args *args,
 					size_t op_size, void *userdata);
 
 void fuse_kern_unmount_compat22(const char *mountpoint);
+
+#ifdef __APPLE__
+DADiskRef fuse_chan_disk(struct fuse_chan *ch);
+void fuse_chan_set_disk(struct fuse_chan *ch, DADiskRef disk);
+#endif
+
 int fuse_chan_clearfd(struct fuse_chan *ch);
 
 void fuse_kern_unmount(const char *mountpoint, int fd);

lib/fuse_session.c

@@ -8,7 +8,7 @@
 
 /*
  * Copyright (c) 2006-2008 Amit Singh/Google Inc.
- * Copyright (c) 2011-2012 Benjamin Fleischer
+ * Copyright (c) 2011-2017 Benjamin Fleischer
  */
 
 #include "fuse_i.h"
@@ -25,11 +25,19 @@
 #  include <sys/param.h>
 #endif
 
+#ifdef __APPLE__
+#  include <CoreFoundation/CoreFoundation.h>
+#endif
+
 struct fuse_chan {
 	struct fuse_chan_ops op;
 
 	struct fuse_session *se;
 
+#ifdef __APPLE__
+	DADiskRef disk;
+#endif
+
 	int fd;
 
 	size_t bufsize;
@@ -185,6 +193,24 @@ struct fuse_chan *fuse_chan_new_compat24(struct fuse_chan_ops_compat24 *op,
 				    data, 24);
 }
 
+#ifdef __APPLE__
+
+DADiskRef fuse_chan_disk(struct fuse_chan *ch)
+{
+	return ch->disk;
+}
+
+void fuse_chan_set_disk(struct fuse_chan *ch, DADiskRef disk)
+{
+	if (ch->disk)
+		CFRelease(ch->disk);
+	if (disk)
+		CFRetain(disk);
+	ch->disk = disk;
+}
+
+#endif /* __APPLE__ */
+
 int fuse_chan_fd(struct fuse_chan *ch)
 {
 	return ch->fd;
@@ -240,6 +266,10 @@ void fuse_chan_destroy(struct fuse_chan *ch)
 	fuse_session_remove_chan(ch);
 	if (ch->op.destroy)
 		ch->op.destroy(ch);
+#ifdef __APPLE__
+	if (ch->disk)
+		CFRelease(ch->disk);
+#endif
 	free(ch);
 }
 

lib/helper.c

@@ -8,7 +8,7 @@
 
 /*
  * Copyright (c) 2006-2008 Amit Singh/Google Inc.
- * Copyright (c) 2011-2016 Benjamin Fleischer
+ * Copyright (c) 2011-2017 Benjamin Fleischer
  */
 
 #include "config.h"
@@ -30,6 +30,11 @@
 #include <errno.h>
 #include <sys/param.h>
 
+#ifdef __APPLE__
+#  include <CoreFoundation/CoreFoundation.h>
+#  include <DiskArbitration/DiskArbitration.h>
+#endif
+
 enum  {
 	KEY_HELP,
 	KEY_HELP_NOHEADER,
@@ -257,6 +262,11 @@ static struct fuse_chan *fuse_mount_common(const char *mountpoint,
 	struct fuse_chan *ch;
 	int fd;
 
+#ifdef __APPLE__
+	CFURLRef mountpoint_url;
+	DADiskRef disk;
+#endif
+
 	/*
 	 * Make sure file descriptors 0, 1 and 2 are open, otherwise chaos
 	 * would ensue.
@@ -275,6 +285,17 @@ static struct fuse_chan *fuse_mount_common(const char *mountpoint,
 	if (!ch)
 		fuse_kern_unmount(mountpoint, fd);
 
+#ifdef __APPLE__
+	mountpoint_url = CFURLCreateFromFileSystemRepresentation(
+		NULL, (const UInt8 *)mountpoint, strlen(mountpoint), TRUE);
+
+	disk = DADiskCreateFromVolumePath(NULL, fuse_dasession, mountpoint_url);
+	fuse_chan_set_disk(ch, disk);
+	CFRelease(disk);
+
+	CFRelease(mountpoint_url);
+#endif
+
 	return ch;
 }