fix
authorMiklos Szeredi <miklos@szeredi.hu>
Sat, 20 Nov 2004 12:22:37 +0000 (12:22 +0000)
committerMiklos Szeredi <miklos@szeredi.hu>
Sat, 20 Nov 2004 12:22:37 +0000 (12:22 +0000)
kernel/inode.c
lib/fuse.c
util/fusermount.c

index 37757338f70ce6c47d0ede7aef35a21142d405c2..55a283b1e3fff896f22c1be3ec6cc79394abbb33 100644 (file)
@@ -359,15 +359,11 @@ static struct fuse_conn *new_conn(void)
 static struct fuse_conn *get_conn(struct file *file, struct super_block *sb)
 {
        struct fuse_conn *fc;
-       struct inode *ino;
 
-       ino = file->f_dentry->d_inode;
        if (file->f_op != &fuse_dev_operations) {
                printk("FUSE: bad communication file descriptor\n");
-               printk("fuse_dev_operations: %p file->f_op: %p\n",
-                      &fuse_dev_operations, file->f_op);
                return NULL;
-       }       
+       }
        fc = new_conn();
        if (fc == NULL) {
                printk("FUSE: failed to allocate connection data\n");
index c6ea2e3b9015c68efb32b8c8b63b1882959d478c..b29db9d2f7d326736092bee358e476d3f8ddfb70 100644 (file)
@@ -1742,7 +1742,7 @@ static int check_version(struct fuse *f)
         return -1;
     }
     if (f->minorver < FUSE_KERNEL_MINOR_VERSION) {
-        fprintf(stderr, "fuse: kernel interface too old: need >= %i.%i",
+        fprintf(stderr, "fuse: kernel interface too old: need >= %i.%i\n",
                 FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
         return -1;
     }    
index 39eb478f3840f3c1423901cd1e8c9cd31d6d935a..98a705b448ef2015532985ce2dd2cad19bf3c3a6 100644 (file)
@@ -239,8 +239,8 @@ static int remove_mount(const char *mnt, int quiet, int lazy)
         else {
             res = addmntent(newfp, entp);
             if (res != 0) {
-                fprintf(stderr, "%s: failed to add entry to %s: %s", progname,
-                        mtab_new, strerror(errno));
+                fprintf(stderr, "%s: failed to add entry to %s: %s\n",
+                        progname, mtab_new, strerror(errno));
                 
             }
         }