diff options
| author | Sylvestre Gallon <syl@cvs.openbsd.org> | 2013-10-07 18:25:33 +0000 |
|---|---|---|
| committer | Sylvestre Gallon <syl@cvs.openbsd.org> | 2013-10-07 18:25:33 +0000 |
| commit | 92c152317e77b3bef9abbad238e92e8f940e5931 (patch) | |
| tree | 781168fdef70fb6f095d933e9519e8fd9d8df879 | |
| parent | e05e27204d7a07fbca0742c17e54119550148e3a (diff) | |
use printf(9) consistently in FUSE
| -rw-r--r-- | sys/miscfs/fuse/fuse_device.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_file.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/fuse/fuse_vnops.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/miscfs/fuse/fuse_device.c b/sys/miscfs/fuse/fuse_device.c index 4e68a49fa61..d223db10683 100644 --- a/sys/miscfs/fuse/fuse_device.c +++ b/sys/miscfs/fuse/fuse_device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_device.c,v 1.8 2013/10/07 18:15:21 syl Exp $ */ +/* $OpenBSD: fuse_device.c,v 1.9 2013/10/07 18:25:32 syl Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -244,7 +244,7 @@ fuseclose(dev_t dev, int flags, int fmt, struct proc *p) return (EINVAL); if (fd->fd_fmp) { - printf("libfuse close the device without umount\n"); + printf("fuse: device close without umount\n"); fd->fd_fmp->sess_init = 0; fd->fd_fmp = NULL; } @@ -461,7 +461,7 @@ fusewrite(dev_t dev, struct uio *uio, int ioflag) /* Check for corrupted fbufs */ if ((fbuf->fb_len && fbuf->fb_err) || SIMPLEQ_EMPTY(&fd->fd_fbufs_wait)) { - printf("corrupted fuse header or queue empty\n"); + printf("fuse: dropping corrupted fusebuf\n"); error = EINVAL; goto end; } diff --git a/sys/miscfs/fuse/fuse_file.c b/sys/miscfs/fuse/fuse_file.c index a8e9bd902a3..c1d011ada7d 100644 --- a/sys/miscfs/fuse/fuse_file.c +++ b/sys/miscfs/fuse/fuse_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_file.c,v 1.4 2013/10/07 18:15:21 syl Exp $ */ +/* $OpenBSD: fuse_file.c,v 1.5 2013/10/07 18:25:32 syl Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -61,7 +61,7 @@ fusefs_file_close(struct fusefs_mnt *fmp, struct fusefs_node * ip, error = fb_queue(fmp->dev, fbuf); if (error) - printf("fuse file error %d\n", error); + printf("fusefs: file error %d\n", error); ip->fufh[fufh_type].fh_id = (uint64_t)-1; ip->fufh[fufh_type].fh_type = FUFH_INVALID; diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c index 6b00e5b9623..04517393991 100644 --- a/sys/miscfs/fuse/fuse_vfsops.c +++ b/sys/miscfs/fuse/fuse_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vfsops.c,v 1.6 2013/10/07 18:15:21 syl Exp $ */ +/* $OpenBSD: fuse_vfsops.c,v 1.7 2013/10/07 18:25:32 syl Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -141,7 +141,7 @@ fusefs_unmount(struct mount *mp, int mntflags, struct proc *p) error = fb_queue(fmp->dev, fbuf); if (error) - printf("error from fuse\n"); + printf("fusefs: error from fuse\n"); fb_delete(fbuf); } @@ -252,7 +252,7 @@ retry: * if not create it */ if ((error = getnewvnode(VT_FUSEFS, mp, &fusefs_vops, &nvp)) != 0) { - printf("fuse: getnewvnode error\n"); + printf("fusefs: getnewvnode error\n"); *vpp = NULLVP; return (error); } diff --git a/sys/miscfs/fuse/fuse_vnops.c b/sys/miscfs/fuse/fuse_vnops.c index 18b0cdd31b1..3b6a29d8ffc 100644 --- a/sys/miscfs/fuse/fuse_vnops.c +++ b/sys/miscfs/fuse/fuse_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_vnops.c,v 1.8 2013/10/07 18:24:12 syl Exp $ */ +/* $OpenBSD: fuse_vnops.c,v 1.9 2013/10/07 18:25:32 syl Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -770,7 +770,7 @@ fusefs_reclaim(void *v) for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(ip->fufh[type]); if (fufh->fh_type != FUFH_INVALID) { - printf("FUSE: vnode being reclaimed is valid\n"); + printf("fusefs: vnode being reclaimed is valid\n"); fusefs_file_close(fmp, ip, fufh->fh_type, type, (ip->vtype == VDIR), ap->a_p); } |