fix

diff --git a/ChangeLog b/ChangeLog
index bd6d44fb7cd5c9d2a75884177240a5fe23ad2138..cd91c20668f11bc61ad9d526a7ec2f3b65bc0d51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/NEWS b/NEWS
index edc4b5eb0e6a7a3c4a0f58d229546f78bb1eea58..7dde53bcad33a583f4efb3fd14c01d06d2bd41d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 50e07ebceff8f60547f15b406c708bfe5ce76c9c..b17adb359a276c03e3569829bf5ca976fb034531 100644 (file)
--- 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 6fc9b69e1418e2d011361b2f56968d0cc12eb614..8ac9787105f0000ebe310a99c5d97c798e2b4375 100644 (file)
--- 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 1f6e90db072906d3058c8964bfa768250f75ee2e..4a3c26447717b22d1cb5625aff48fd07cb8308ef 100644 (file)
--- 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,