From 256739a410f38f424e30011e329e41647f3cd9ff Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Sat, 20 Nov 2004 12:22:37 +0000 Subject: fix --- kernel/inode.c | 6 +----- lib/fuse.c | 2 +- util/fusermount.c | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/inode.c b/kernel/inode.c index 3775733..55a283b 100644 --- a/kernel/inode.c +++ b/kernel/inode.c @@ -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"); diff --git a/lib/fuse.c b/lib/fuse.c index c6ea2e3..b29db9d 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -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; } diff --git a/util/fusermount.c b/util/fusermount.c index 39eb478..98a705b 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -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)); } } -- cgit v1.2.3