Module Name: src
Committed By: skrll
Date: Mon Jan 11 22:02:29 UTC 2021
Modified Files:
src/sys/arch/xen/xen: xenevt.c
src/sys/fs/udf: udf_subr.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/xen/xen/xenevt.c
cvs rdiff -u -r1.151 -r1.152 src/sys/fs/udf/udf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.62 src/sys/arch/xen/xen/xenevt.c:1.63
--- src/sys/arch/xen/xen/xenevt.c:1.62 Mon Jan 11 22:01:14 2021
+++ src/sys/arch/xen/xen/xenevt.c Mon Jan 11 22:02:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.62 2021/01/11 22:01:14 skrll Exp $ */
+/* $NetBSD: xenevt.c,v 1.63 2021/01/11 22:02:28 skrll Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.62 2021/01/11 22:01:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.63 2021/01/11 22:02:28 skrll Exp $");
#include "opt_xen.h"
#include <sys/param.h>
@@ -158,7 +158,7 @@ static evtchn_port_t xenevt_alloc_event(
op.u.alloc_unbound.dom = DOMID_SELF;
op.u.alloc_unbound.remote_dom = DOMID_SELF;
if (HYPERVISOR_event_channel_op(&op) != 0)
- panic("%s: Failed to allocate loopback event\n", __func__);
+ panic("%s: Failed to allocate loopback event\n", __func__);
return op.u.alloc_unbound.port;
}
@@ -604,7 +604,7 @@ xenevt_fioctl(struct file *fp, u_long cm
case IOCTL_EVTCHN_UNBIND:
{
struct ioctl_evtchn_unbind *unbind = addr;
-
+
if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
@@ -625,7 +625,7 @@ xenevt_fioctl(struct file *fp, u_long cm
case IOCTL_EVTCHN_NOTIFY:
{
struct ioctl_evtchn_notify *notify = addr;
-
+
if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
@@ -645,11 +645,11 @@ xenevt_fioctl(struct file *fp, u_long cm
return 0;
}
-/*
- * Support for poll() system call
+/*
+ * Support for poll() system call
*
* Return true if the specific operation will not block indefinitely.
- */
+ */
static int
xenevt_fpoll(struct file *fp, int events)
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.151 src/sys/fs/udf/udf_subr.c:1.152
--- src/sys/fs/udf/udf_subr.c:1.151 Mon Jan 11 22:01:15 2021
+++ src/sys/fs/udf/udf_subr.c Mon Jan 11 22:02:28 2021
@@ -1,9 +1,9 @@
-/* $NetBSD: udf_subr.c,v 1.151 2021/01/11 22:01:15 skrll Exp $ */
+/* $NetBSD: udf_subr.c,v 1.152 2021/01/11 22:02:28 skrll Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -12,7 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -23,13 +23,13 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
*/
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.151 2021/01/11 22:01:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.152 2021/01/11 22:02:28 skrll Exp $");
#endif /* not lint */
@@ -809,7 +809,7 @@ udf_lock_node(struct udf_node *udf_node,
if (ret == EWOULDBLOCK) {
DPRINTF(LOCKING, ( "udf_lock_node: udf_node %p would block "
"wanted at %s:%d, previously locked at %s:%d\n",
- udf_node, fname, lineno,
+ udf_node, fname, lineno,
udf_node->lock_fname, udf_node->lock_lineno));
}
}
@@ -982,7 +982,7 @@ udf_get_record_vpart(struct udf_mount *u
}
-/*
+/*
* BUGALERT: some rogue implementations use random physical partition
* numbers to break other implementations so lookup the number.
*/
@@ -1590,7 +1590,7 @@ udf_read_physical_partition_spacetables(
if (partd == NULL)
continue;
parthdr = &partd->_impl_use.part_hdr;
-
+
len = udf_rw32(parthdr->unalloc_space_table.len);
if (len) {
printf("UDF mount: space tables not supported\n");
@@ -1649,7 +1649,7 @@ udf_read_physical_partition_spacetables(
if (partd == NULL)
continue;
parthdr = &partd->_impl_use.part_hdr;
-
+
len = udf_rw32(parthdr->freed_space_table.len);
if (len) {
printf("UDF mount: space tables not supported\n");
@@ -2014,7 +2014,7 @@ udf_process_vds(struct udf_mount *ump) {
DPRINTF(VOLUMES, ("\t%d -> %d(%d) type %d\n", log_part,
raw_phys_part, phys_part, pmap_type));
-
+
if (phys_part == UDF_PARTITIONS)
return EINVAL;
if (pmap_type == UDF_VTOP_TYPE_UNKNOWN)
@@ -2130,7 +2130,7 @@ udf_process_vds(struct udf_mount *ump) {
snprintb(bits, sizeof(bits), UDFONERROR_BITS, ump->lvreadwrite);
DPRINTF(VOLUMES, ("\tactions on logvol errors %s\n", bits));
- DPRINTF(VOLUMES, ("\tselected sheduler `%s`\n",
+ DPRINTF(VOLUMES, ("\tselected sheduler `%s`\n",
(ump->strategy == &udf_strat_direct) ? "Direct" :
(ump->strategy == &udf_strat_sequential) ? "Sequential" :
(ump->strategy == &udf_strat_rmw) ? "RMW" : "UNKNOWN!"));
@@ -2314,12 +2314,12 @@ udf_create_parentfid(struct udf_mount *u
* (a) inside the file's (e)fe in the length of the extended attribute area
* before the allocation descriptors/filedata
*
- * (b) in a file referenced by (e)fe->ext_attr_icb and
+ * (b) in a file referenced by (e)fe->ext_attr_icb and
*
* (c) in the e(fe)'s associated stream directory that can hold various
* sub-files. In the stream directory a few fixed named subfiles are reserved
* for NT/Unix ACL's and OS/2 attributes.
- *
+ *
* NOTE: Extended attributes are read randomly but allways written
* *atomicaly*. For ACL's this interface is propably different but not known
* to me yet.
@@ -2587,7 +2587,7 @@ udf_extattr_insert_internal(struct udf_m
/* --------------------------------------------------------------------- */
-static int
+static int
udf_update_lvid_from_vat_extattr(struct udf_node *vat_node)
{
struct udf_mount *ump;
@@ -2654,7 +2654,7 @@ udf_update_lvid_from_vat_extattr(struct
}
-static int
+static int
udf_update_vat_extattr_from_lvid(struct udf_node *vat_node)
{
struct udf_mount *ump;
@@ -3005,7 +3005,7 @@ udf_check_for_vat(struct udf_node *vat_n
lvinfo->min_udf_readver = vat->min_udf_readver;
lvinfo->min_udf_writever = vat->min_udf_writever;
lvinfo->max_udf_writever = vat->max_udf_writever;
-
+
udf_update_logvolname(ump, vat->logvol_id);
}
@@ -3061,7 +3061,7 @@ udf_search_vat(struct udf_mount *ump, un
mapping = mapping;
DPRINTF(VOLUMES, ("Searching VAT\n"));
-
+
/*
* Start reading forward in blocks from the first possible vat
* location. If not found in this block, start again a bit before
@@ -3069,7 +3069,7 @@ udf_search_vat(struct udf_mount *ump, un
*/
late_vat_loc = ump->last_possible_vat_location;
early_vat_loc = MAX(late_vat_loc - 64, ump->first_possible_vat_location);
-
+
DPRINTF(VOLUMES, ("\tfull range %d to %d\n", early_vat_loc, late_vat_loc));
accepted_vat_node = NULL;
do {
@@ -4119,7 +4119,7 @@ static uint32_t
unix_mode_to_udf_perm(mode_t mode)
{
uint32_t perm;
-
+
perm = ((mode & S_IRWXO) );
perm |= ((mode & S_IRWXG) << 2);
perm |= ((mode & S_IRWXU) << 4);
@@ -4423,7 +4423,7 @@ udf_getownership(struct udf_node *udf_no
uid = (uid_t)udf_rw32(efe->uid);
gid = (gid_t)udf_rw32(efe->gid);
}
-
+
/* do the uid/gid translation game */
if (uid == (uid_t) -1)
uid = ump->mount_args.anon_uid;
@@ -4551,7 +4551,7 @@ udf_dirhash_fill(struct udf_node *dir_no
*
*/
-int
+int
udf_lookup_name_in_dir(struct vnode *vp, const char *name, int namelen,
struct long_ad *icb_loc, int *found)
{
@@ -4873,7 +4873,7 @@ udf_dir_detach(struct udf_mount *ump, st
/* write out */
error = vn_rdwr(UIO_WRITE, dir_node->vnode,
- fid, fidsize, diroffset,
+ fid, fidsize, diroffset,
UIO_SYSSPACE, IO_ALTSEMANTICS | IO_NODELOCKED,
FSCRED, NULL, NULL);
if (error)
@@ -5036,7 +5036,7 @@ udf_dir_update_rootentry(struct udf_moun
/* write out */
error = vn_rdwr(UIO_WRITE, dir_node->vnode,
- fid, fidsize, diroffset,
+ fid, fidsize, diroffset,
UIO_SYSSPACE, IO_ALTSEMANTICS | IO_NODELOCKED,
FSCRED, NULL, NULL);
@@ -5240,7 +5240,7 @@ udf_dir_attach(struct udf_mount *ump, st
/* writeout FID/update parent directory */
error = vn_rdwr(UIO_WRITE, dvp,
- fid, chosen_size, chosen_fid_pos,
+ fid, chosen_size, chosen_fid_pos,
UIO_SYSSPACE, IO_ALTSEMANTICS | IO_NODELOCKED,
FSCRED, NULL, NULL);
@@ -5422,7 +5422,7 @@ udf_loadvnode(struct mount *mp, struct v
/* choose this one */
last_fe_icb_loc = icb_loc;
-
+
/* record and process/update (ext)fentry */
if (dscr_type == TAGID_FENTRY) {
if (udf_node->fe)
@@ -6494,7 +6494,7 @@ recount:
udf_sync_pass(ump, cred, 3, &ndirty);
DPRINTF(SYNC, ("counted num dirty pending blocks %d\n",
ndirty));
-
+
if (ndirty) {
/* 1/4 second wait */
kpause("udfsync2", false, hz/4, NULL);
