Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 233107 Details for
Bug 291540
sys-fs/zfs-fuse: new devolopers / new beta version
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
files/0.6.9_beta3/fix_zfs-fuse-socket.patch
fix_zfs-fuse-socket.patch (text/plain), 1.89 KB, created by
Stefan G. Weichinger
on 2010-05-27 10:58:48 UTC
(
hide
)
Description:
files/0.6.9_beta3/fix_zfs-fuse-socket.patch
Filename:
MIME Type:
Creator:
Stefan G. Weichinger
Created:
2010-05-27 10:58:48 UTC
Size:
1.89 KB
patch
obsolete
>From 42fe23421de4299da4e34ece50b8c852e2da5e98 Mon Sep 17 00:00:00 2001 >From: Seth Heeren <sgheeren@hotmail.com> >Date: Sun, 23 May 2010 01:33:20 +0200 >Subject: [PATCH] improved initialization order so connections to zfs-fuse can be made once the process is forked/demonized (addresses issue #36) > >--- > src/zfs-fuse/main.c | 2 ++ > src/zfs-fuse/util.c | 12 +++++++++--- > src/zfs-fuse/util.h | 1 + > 3 files changed, 12 insertions(+), 3 deletions(-) > >diff --git a/src/zfs-fuse/main.c b/src/zfs-fuse/main.c >index dbff1c1..71210e5 100644 >--- a/src/zfs-fuse/main.c >+++ b/src/zfs-fuse/main.c >@@ -389,6 +389,8 @@ int main(int argc, char *argv[]) > > if (!block_cache) /* direct IO enabled */ > syslog(LOG_WARNING,"block cache disabled -- mmap() cannot be used in ZFS filesystems"); >+ if (do_init_fusesocket() != 0) >+ return 1; > if (cf_daemonize) { > do_daemon(cf_pidfile); > } >diff --git a/src/zfs-fuse/util.c b/src/zfs-fuse/util.c >index 31b5ecf..a2d6553 100644 >--- a/src/zfs-fuse/util.c >+++ b/src/zfs-fuse/util.c >@@ -89,6 +89,14 @@ void do_daemon(const char *pidfile) > > 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(); >@@ -97,9 +105,7 @@ int do_init() > > VERIFY(zfs_ioctl_init() == 0); > >- ioctl_fd = zfsfuse_socket_create(); >- if(ioctl_fd == -1) >- return -1; >+ VERIFY(ioctl_fd != -1); // initialization moved to do_init_fusesocket > > pthread_attr_t attr; > pthread_attr_init(&attr); >diff --git a/src/zfs-fuse/util.h b/src/zfs-fuse/util.h >index 1b67d20..94d9ab0 100644 >--- a/src/zfs-fuse/util.h >+++ b/src/zfs-fuse/util.h >@@ -30,6 +30,7 @@ > #include <sys/vfs.h> > > extern int do_init(); >+extern int do_init_fusesocket(); > extern void do_daemon(const char *pidfile); > extern void do_exit(); > extern int do_mount(char *spec, char *dir, int mflag, char *opt); >-- >1.6.3.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 291540
:
212198
|
212200
|
212431
|
230213
|
232949
|
232963
|
233105
| 233107 |
233173
|
233525
|
233553
|
234029
|
234245
|
234247
|
234249
|
234251
|
234253