Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add puffs_cancel(), which allows to back down after puffs_init() 

and before puffs_mount().
(this should actually be integrated with puffs_exit(), but that
routine is currently so non-sensible that I didn't bother now)
This commit is contained in:
pooka 2008-12-12 19:45:16 +00:00
parent 41f31dac6d
commit 33a0d776c1
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/libpuffs/puffs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: puffs.c,v 1.93 2008/12/12 18:59:53 pooka Exp $ */ /* $NetBSD: puffs.c,v 1.94 2008/12/12 19:45:16 pooka Exp $ */
/* /*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(lint) #if !defined(lint)
__RCSID("$NetBSD: puffs.c,v 1.93 2008/12/12 18:59:53 pooka Exp $"); __RCSID("$NetBSD: puffs.c,v 1.94 2008/12/12 19:45:16 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <sys/param.h> #include <sys/param.h>
@ -463,12 +463,23 @@ puffs_daemon(struct puffs_usermount *pu, int nochdir, int noclose)
return -1; return -1;
} }
static void
shutdaemon(struct puffs_usermount *pu, int error)
{
ssize_t n;
n = write(pu->pu_dpipe[1], &error, sizeof(int));
assert(n == 4);
close(pu->pu_dpipe[0]);
close(pu->pu_dpipe[1]);
pu->pu_state &= ~PU_PUFFSDAEMON;
}
int int
puffs_mount(struct puffs_usermount *pu, const char *dir, int mntflags, puffs_mount(struct puffs_usermount *pu, const char *dir, int mntflags,
puffs_cookie_t cookie) puffs_cookie_t cookie)
{ {
char rp[MAXPATHLEN]; char rp[MAXPATHLEN];
ssize_t n;
int rv, fd, sverrno; int rv, fd, sverrno;
char *comfd; char *comfd;
@ -566,12 +577,8 @@ do { \
free(pu->pu_kargp); free(pu->pu_kargp);
pu->pu_kargp = NULL; pu->pu_kargp = NULL;
if (pu->pu_state & PU_PUFFSDAEMON) { if (pu->pu_state & PU_PUFFSDAEMON)
n = write(pu->pu_dpipe[1], &sverrno, sizeof(int)); shutdaemon(pu, sverrno);
assert(n == 4);
close(pu->pu_dpipe[0]);
close(pu->pu_dpipe[1]);
}
errno = sverrno; errno = sverrno;
return rv; return rv;
@ -658,6 +665,15 @@ _puffs_init(int develv, struct puffs_ops *pops, const char *mntfromname,
return NULL; return NULL;
} }
void
puffs_cancel(struct puffs_usermount *pu, int error)
{
assert(puffs_getstate(pu) < PUFFS_STATE_RUNNING);
shutdaemon(pu, error);
free(pu);
}
/* /*
* XXX: there's currently no clean way to request unmount from * XXX: there's currently no clean way to request unmount from
* within the user server, so be very brutal about it. * within the user server, so be very brutal about it.
@ -669,6 +685,7 @@ puffs_exit(struct puffs_usermount *pu, int force)
struct puffs_node *pn; struct puffs_node *pn;
force = 1; /* currently */ force = 1; /* currently */
assert((pu->pu_state & PU_PUFFSDAEMON) == 0);
if (pu->pu_fd) if (pu->pu_fd)
close(pu->pu_fd); close(pu->pu_fd);

3
lib/libpuffs/puffs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: puffs.h,v 1.109 2008/12/12 18:59:53 pooka Exp $ */ /* $NetBSD: puffs.h,v 1.110 2008/12/12 19:45:16 pooka Exp $ */
/* /*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@ -419,6 +419,7 @@ struct puffs_usermount *_puffs_init(int, struct puffs_ops *, const char *,
const char *, void *, uint32_t); const char *, void *, uint32_t);
int puffs_mount(struct puffs_usermount *, const char *, int, void*); int puffs_mount(struct puffs_usermount *, const char *, int, void*);
int puffs_exit(struct puffs_usermount *, int); int puffs_exit(struct puffs_usermount *, int);
void puffs_cancel(struct puffs_usermount *, int);
int puffs_mainloop(struct puffs_usermount *); int puffs_mainloop(struct puffs_usermount *);
int puffs_daemon(struct puffs_usermount *, int, int); int puffs_daemon(struct puffs_usermount *, int, int);