Attachment #233107 for bug #291540

Lines 389-394 int main(int argc, char *argv[]) Link Here

(-)a/src/zfs-fuse/main.c (+2 lines)
389		389
390	if (!block_cache) /* direct IO enabled */	390	if (!block_cache) /* direct IO enabled */
391	syslog(LOG_WARNING,"block cache disabled -- mmap() cannot be used in ZFS filesystems");	391	syslog(LOG_WARNING,"block cache disabled -- mmap() cannot be used in ZFS filesystems");
		392	if (do_init_fusesocket() != 0)
		393	return 1;
392	if (cf_daemonize) {	394	if (cf_daemonize) {
393	do_daemon(cf_pidfile);	395	do_daemon(cf_pidfile);
394	}	396	}





extern size_t stack_size;

int do_init_fusesocket()
{
	ioctl_fd = zfsfuse_socket_create();
	if(ioctl_fd == -1)
		return -1;
    return 0;
}

int do_init()
{
	libsolkerncompat_init();


	VERIFY(zfs_ioctl_init() == 0);

    VERIFY(ioctl_fd != -1); // initialization moved to do_init_fusesocket
	if(ioctl_fd == -1)
		return -1;

	pthread_attr_t attr;
	pthread_attr_init(&attr);

Lines 30-35 Link Here

(-)a/src/zfs-fuse/util.h (-1 / +1 lines)
30	#include <sys/vfs.h>	30	#include <sys/vfs.h>
31		31
32	extern int do_init();	32	extern int do_init();
		33	extern int do_init_fusesocket();
33	extern void do_daemon(const char *pidfile);	34	extern void do_daemon(const char *pidfile);
34	extern void do_exit();	35	extern void do_exit();
35	extern int do_mount(char spec, char dir, int mflag, char *opt);	36	extern int do_mount(char spec, char dir, int mflag, char *opt);
36	-

Return to bug 291540

Lines 89-94 void do_daemon(const char *pidfile) Link Here

(-)a/src/zfs-fuse/util.c (-3 / +9 lines)
89		89
90	extern size_t stack_size;	90	extern size_t stack_size;
91		91
		92	int do_init_fusesocket()
		93	{
		94	ioctl_fd = zfsfuse_socket_create();
		95	if(ioctl_fd == -1)
		96	return -1;
		97	return 0;
		98	}
		99
92	int do_init()	100	int do_init()
93	{	101	{
94	libsolkerncompat_init();	102	libsolkerncompat_init();
Lines 97-105 int do_init() Link Here
97		105
98	VERIFY(zfs_ioctl_init() == 0);	106	VERIFY(zfs_ioctl_init() == 0);
99		107
100	ioctl_fd = zfsfuse_socket_create();	108	VERIFY(ioctl_fd != -1); // initialization moved to do_init_fusesocket
101	if(ioctl_fd == -1)
102	return -1;
103		109
104	pthread_attr_t attr;	110	pthread_attr_t attr;
105	pthread_attr_init(&attr);	111	pthread_attr_init(&attr);