Module Name: src
Committed By: prlw1
Date: Mon May 25 20:57:18 UTC 2015
Modified Files:
src/sys/dev: vnd.c vndvar.h
Log Message:
whitespace police
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/sys/dev/vnd.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/vndvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.243 src/sys/dev/vnd.c:1.244
--- src/sys/dev/vnd.c:1.243 Sun Apr 26 15:15:20 2015
+++ src/sys/dev/vnd.c Mon May 25 20:57:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.244 2015/05/25 20:57:18 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.244 2015/05/25 20:57:18 prlw1 Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -658,7 +658,7 @@ vndthread(void *arg)
/* handle a compressed read */
if ((obp->b_flags & B_READ) != 0 && (vnd->sc_flags & VNF_COMP)) {
off_t bn;
-
+
/* Convert to a byte offset within the file. */
bn = obp->b_rawblkno *
vnd->sc_dkdev.dk_label->d_secsize;
@@ -667,7 +667,7 @@ vndthread(void *arg)
goto done;
}
#endif /* VND_COMPRESSION */
-
+
/*
* Allocate a header for this transfer and link it to the
* buffer
@@ -896,7 +896,7 @@ handle_with_strategy(struct vnd_softc *v
* fsync won't wait for this write which
* has no chance to complete before all nested bufs
* have been queued. But it has to be done
- * before the last VOP_STRATEGY()
+ * before the last VOP_STRATEGY()
* or the call to nestiobuf_done().
*/
w_vp = bp->b_vp;
@@ -905,9 +905,9 @@ handle_with_strategy(struct vnd_softc *v
mutex_exit(w_vp->v_interlock);
}
KASSERT(skipped != 0 || nbp != NULL);
- if (skipped)
+ if (skipped)
nestiobuf_done(bp, skipped, error);
- else
+ else
VOP_STRATEGY(vp, nbp);
}
@@ -1181,11 +1181,11 @@ vndioctl(dev_t dev, u_long cmd, void *da
int i;
u_int32_t comp_size;
u_int32_t comp_maxsize;
-
+
/* allocate space for compresed file header */
ch = malloc(sizeof(struct vnd_comp_header),
M_TEMP, M_WAITOK);
-
+
/* read compressed file header */
error = vn_rdwr(UIO_READ, nd.ni_vp, (void *)ch,
sizeof(struct vnd_comp_header), 0, UIO_SYSSPACE,
@@ -1195,7 +1195,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
VOP_UNLOCK(nd.ni_vp);
goto close_and_exit;
}
-
+
/* save some header info */
vnd->sc_comp_blksz = ntohl(ch->block_size);
/* note last offset is the file byte size */
@@ -1214,17 +1214,17 @@ vndioctl(dev_t dev, u_long cmd, void *da
error = EINVAL;
goto close_and_exit;
}
-
+
/* set decompressed file size */
vattr.va_size =
((u_quad_t)vnd->sc_comp_numoffs - 1) *
(u_quad_t)vnd->sc_comp_blksz;
-
+
/* allocate space for all the compressed offsets */
vnd->sc_comp_offsets =
malloc(sizeof(u_int64_t) * vnd->sc_comp_numoffs,
M_DEVBUF, M_WAITOK);
-
+
/* read in the offsets */
error = vn_rdwr(UIO_READ, nd.ni_vp,
(void *)vnd->sc_comp_offsets,
@@ -1250,16 +1250,16 @@ vndioctl(dev_t dev, u_long cmd, void *da
}
vnd->sc_comp_offsets[vnd->sc_comp_numoffs - 1] =
be64toh(vnd->sc_comp_offsets[vnd->sc_comp_numoffs - 1]);
-
+
/* create compressed data buffer */
vnd->sc_comp_buff = malloc(comp_maxsize,
M_DEVBUF, M_WAITOK);
-
+
/* create decompressed buffer */
vnd->sc_comp_decombuf = malloc(vnd->sc_comp_blksz,
M_DEVBUF, M_WAITOK);
vnd->sc_comp_buffblk = -1;
-
+
/* Initialize decompress stream */
memset(&vnd->sc_comp_stream, 0, sizeof(z_stream));
vnd->sc_comp_stream.zalloc = vnd_alloc;
@@ -1273,7 +1273,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
error = EINVAL;
goto close_and_exit;
}
-
+
vnd->sc_flags |= VNF_COMP | VNF_READONLY;
#else /* !VND_COMPRESSION */
VOP_UNLOCK(nd.ni_vp);
@@ -1281,7 +1281,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
goto close_and_exit;
#endif /* VND_COMPRESSION */
}
-
+
VOP_UNLOCK(nd.ni_vp);
vnd->sc_vp = nd.ni_vp;
vnd->sc_size = btodb(vattr.va_size); /* note truncation */
@@ -2041,7 +2041,7 @@ static int
vnd_modcmd(modcmd_t cmd, void *arg)
{
int bmajor = -1, cmajor = -1, error = 0;
-
+
switch (cmd) {
case MODULE_CMD_INIT:
error = config_cfdriver_attach(&vnd_cd);
@@ -2055,7 +2055,7 @@ vnd_modcmd(modcmd_t cmd, void *arg)
vnd_cd.cd_name);
break;
}
-
+
error = devsw_attach("vnd", &vnd_bdevsw, &bmajor,
&vnd_cdevsw, &cmajor);
if (error) {
@@ -2063,7 +2063,7 @@ vnd_modcmd(modcmd_t cmd, void *arg)
config_cfdriver_detach(&vnd_cd);
break;
}
-
+
break;
case MODULE_CMD_FINI:
Index: src/sys/dev/vndvar.h
diff -u src/sys/dev/vndvar.h:1.33 src/sys/dev/vndvar.h:1.34
--- src/sys/dev/vndvar.h:1.33 Mon Jun 3 16:42:32 2013
+++ src/sys/dev/vndvar.h Mon May 25 20:57:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vndvar.h,v 1.33 2013/06/03 16:42:32 christos Exp $ */
+/* $NetBSD: vndvar.h,v 1.34 2015/05/25 20:57:18 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@ struct vnode;
* A vnode disk's state information.
*/
struct vnd_softc {
- device_t sc_dev;
+ device_t sc_dev;
int sc_flags; /* flags */
uint64_t sc_size; /* size of vnd */
struct vnode *sc_vp; /* vnode */
