From 9cda21dc9ab49cfdcb929e96e0a2c33096b02ea0 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Wed, 12 Jun 2013 22:55:03 +0000 Subject: remove extra whitespace --- sys/miscfs/fuse/fuse_device.c | 8 +++----- sys/miscfs/fuse/fuse_lookup.c | 6 +++--- sys/miscfs/fuse/fuse_vfsops.c | 4 +--- sys/miscfs/fuse/fuse_vnops.c | 8 ++++---- 4 files changed, 11 insertions(+), 15 deletions(-) (limited to 'sys/miscfs') diff --git a/sys/miscfs/fuse/fuse_device.c b/sys/miscfs/fuse/fuse_device.c index 17d9e53da43..2962488549e 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.1 2013/06/03 15:50:56 tedu Exp $ */ +/* $OpenBSD: fuse_device.c,v 1.2 2013/06/12 22:55:02 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon * @@ -94,8 +94,7 @@ fuse_dump_buff(char *buff, int len) int i; bzero(text, 17); - for (i = 0; i < len ; i++) { - + for (i = 0; i < len; i++) { if (i != 0 && (i % 16) == 0) { printf(": %s\n", text); bzero(text, 17); @@ -291,7 +290,6 @@ fuseread(dev_t dev, struct uio *uio, int ioflag) return (ENODEV); if (SIMPLEQ_EMPTY(&sc->sc_fbufs_in)) { - if (ioflag & O_NONBLOCK) return (EAGAIN); @@ -392,7 +390,7 @@ fusewrite(dev_t dev, struct uio *uio, int ioflag) if (uio->uio_resid != hdr.fh_len || (uio->uio_resid != 0 && hdr.fh_err) || - SIMPLEQ_EMPTY(&sc->sc_fbufs_wait) ) { + SIMPLEQ_EMPTY(&sc->sc_fbufs_wait)) { printf("corrupted fuse header or queue empty\n"); return (EINVAL); } diff --git a/sys/miscfs/fuse/fuse_lookup.c b/sys/miscfs/fuse/fuse_lookup.c index 6060bc40d59..d48f792c2df 100644 --- a/sys/miscfs/fuse/fuse_lookup.c +++ b/sys/miscfs/fuse/fuse_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_lookup.c,v 1.2 2013/06/05 18:26:06 tedu Exp $ */ +/* $OpenBSD: fuse_lookup.c,v 1.3 2013/06/12 22:55:02 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon * @@ -98,7 +98,7 @@ fusefs_lookup(void *v) if (error) { if ((nameiop == CREATE || nameiop == RENAME) && - (flags & ISLASTCN) ) { + (flags & ISLASTCN)) { if (vdp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); @@ -215,7 +215,7 @@ fusefs_lookup(void *v) out: if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE && - nameiop != DELETE ) + nameiop != DELETE) cache_enter(vdp, *vpp, cnp); if (fbuf) diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c index 3a8c24d300c..fd6059c5780 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.3 2013/06/09 12:51:40 tedu Exp $ */ +/* $OpenBSD: fuse_vfsops.c,v 1.4 2013/06/12 22:55:02 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon * @@ -119,7 +119,6 @@ fusefs_unmount(struct mount *mp, int mntflags, struct proc *p) fmp = VFSTOFUSEFS(mp); if (fmp->sess_init) { - fmp->sess_init = 0; fbuf = fb_setup(0, 0, FBT_DESTROY, p); @@ -128,7 +127,6 @@ fusefs_unmount(struct mount *mp, int mntflags, struct proc *p) if (error) printf("error from fuse\n"); - } else { fuse_device_cleanup(fmp->dev, NULL); } diff --git a/sys/miscfs/fuse/fuse_vnops.c b/sys/miscfs/fuse/fuse_vnops.c index 2f92d80e8db..1bccd2e2227 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.2 2013/06/05 18:26:06 tedu Exp $ */ +/* $OpenBSD: fuse_vnops.c,v 1.3 2013/06/12 22:55:02 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon * @@ -341,9 +341,9 @@ fusefs_setattr(void *v) * Check for unsettable attributes. */ if ((vap->va_type != VNON) || (vap->va_nlink != VNOVAL) || - (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) || - (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) || - ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) + (vap->va_fsid != VNOVAL) || (vap->va_fileid != VNOVAL) || + (vap->va_blocksize != VNOVAL) || (vap->va_rdev != VNOVAL) || + ((int)vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) return (EINVAL); if (!fmp->sess_init || (fmp->undef_op & UNDEF_SETATTR)) -- cgit v1.2.3