diff options
| author |  Miklos Szeredi <miklos@szeredi.hu> | 2006-07-14 10:13:16 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2006-07-14 10:13:16 +0000 |
| commit | 3b0e4faeaf38e234b8c1209ec92824691503995f (patch) | |
| tree | c9840816a276836eb19b17c96e34d10b7c96ac90 | |
| parent | ec3f6e4c0d5b3f1a1f91cf2a35a818ca9973fc6f (diff) | |
fix
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | kernel/control.c | 4 | ||||
| -rw-r--r-- | lib/mount.c | 3 | ||||
| -rw-r--r-- | util/fusermount.c | 3 |
5 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-07-05 Miklos Szeredi <miklos@szeredi.hu> + + * fusermount: if /dev/fuse doesn't exist, suggest moddprobing + fuse; this makes sense on systems using udev. Reported by + Szakacsits Szabolcs + 2006-06-29 Miklos Szeredi <miklos@szeredi.hu> * Released 2.6.0-pre3 @@ -4,6 +4,10 @@ What is new in 2.6 - Support for aborting filesystem connection + - POSIX file locking support + + - Request interruption support + What is new in 2.5 - Merge library part of FreeBSD port diff --git a/kernel/control.c b/kernel/control.c index 50e07eb..b17adb3 100644 --- a/kernel/control.c +++ b/kernel/control.c @@ -105,7 +105,7 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent, /* * Add a connection to the control filesystem (if it exists). Caller - * must host fuse_mutex + * must hold fuse_mutex */ int fuse_ctl_add_conn(struct fuse_conn *fc) { @@ -139,7 +139,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc) /* * Remove a connection from the control filesystem (if it exists). - * Caller must host fuse_mutex + * Caller must hold fuse_mutex */ void fuse_ctl_remove_conn(struct fuse_conn *fc) { diff --git a/lib/mount.c b/lib/mount.c index 6fc9b69..8ac9787 100644 --- a/lib/mount.c +++ b/lib/mount.c @@ -148,8 +148,7 @@ static int receive_fd(int fd) struct iovec iov; char buf[1]; int rv; - int connfd = -1; - char ccmsg[CMSG_SPACE(sizeof(connfd))]; + char ccmsg[CMSG_SPACE(sizeof(int))]; struct cmsghdr *cmsg; iov.iov_base = buf; diff --git a/util/fusermount.c b/util/fusermount.c index 1f6e90d..4a3c264 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -794,7 +794,8 @@ static int try_open(const char *dev, char **devp, int silent) close(fd); fd = -1; } - } else if (errno == ENODEV) + } else if (errno == ENODEV || + errno == ENOENT) /* check for ENOENT too, for the udev case */ return -2; else if (!silent) { fprintf(stderr, "%s: failed to open %s: %s\n", progname, dev, |