Module Name: src
Committed By: tkusumi
Date: Fri Dec 6 16:33:47 UTC 2019
Modified Files:
src/sys/dev/dm: device-mapper.c dm_ioctl.c dm_target_stripe.c
Log Message:
dm: Fix typos in comments/messages
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dm/dm_target_stripe.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/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.45 src/sys/dev/dm/device-mapper.c:1.46
--- src/sys/dev/dm/device-mapper.c:1.45 Thu Dec 5 15:52:39 2019
+++ src/sys/dev/dm/device-mapper.c Fri Dec 6 16:33:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.45 2019/12/05 15:52:39 tkusumi Exp $ */
+/* $NetBSD: device-mapper.c,v 1.46 2019/12/06 16:33:47 tkusumi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -428,7 +428,7 @@ dm_ioctl_switch(u_long cmd)
switch(cmd) {
case NETBSD_DM_IOCTL:
- aprint_debug("dm NetBSD_DM_IOCTL called\n");
+ aprint_debug("dm NETBSD_DM_IOCTL called\n");
break;
default:
aprint_debug("dm unknown ioctl called\n");
@@ -637,9 +637,9 @@ dmstrategy(struct buf *bp)
PRIu64"\n", buf_start, buf_len);
aprint_debug("start-buf_start %010"PRIu64", end %010"
PRIu64"\n", start - buf_start, end);
- aprint_debug("start %010" PRIu64" , end %010"
+ aprint_debug("start %010" PRIu64", end %010"
PRIu64"\n", start, end);
- aprint_debug("\n----------------------------------------\n");
+ aprint_debug("----------------------------------------\n");
if (start < end) {
/* create nested buffer */
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.38 src/sys/dev/dm/dm_ioctl.c:1.39
--- src/sys/dev/dm/dm_ioctl.c:1.38 Thu Dec 5 15:52:39 2019
+++ src/sys/dev/dm/dm_ioctl.c Fri Dec 6 16:33:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.38 2019/12/05 15:52:39 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.39 2019/12/06 16:33:47 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.38 2019/12/05 15:52:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.39 2019/12/06 16:33:47 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -131,10 +131,10 @@ dm_dbg_print_flags(int flags)
aprint_debug("dbg_flags: DM_READONLY_FLAG set In/Out\n");
if (flags & DM_SUSPEND_FLAG)
- aprint_debug("dbg_flags: DM_SUSPEND_FLAG set In/Out \n");
+ aprint_debug("dbg_flags: DM_SUSPEND_FLAG set In/Out\n");
if (flags & DM_PERSISTENT_DEV_FLAG)
- aprint_debug("db_flags: DM_PERSISTENT_DEV_FLAG set In\n");
+ aprint_debug("dbg_flags: DM_PERSISTENT_DEV_FLAG set In\n");
if (flags & DM_STATUS_TABLE_FLAG)
aprint_debug("dbg_flags: DM_STATUS_TABLE_FLAG set In\n");
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.28 src/sys/dev/dm/dm_target_stripe.c:1.29
--- src/sys/dev/dm/dm_target_stripe.c:1.28 Fri Dec 6 16:11:59 2019
+++ src/sys/dev/dm/dm_target_stripe.c Fri Dec 6 16:33:47 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.28 2019/12/06 16:11:59 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.29 2019/12/06 16:33:47 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.28 2019/12/06 16:11:59 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.29 2019/12/06 16:33:47 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -241,11 +241,11 @@ dm_target_stripe_strategy(dm_table_entry
blkoff = 0;
num_blks = bp->b_resid / DEV_BSIZE;
for (;;) {
- /* blockno to strip piece nr */
+ /* blockno to stripe piece nr */
stripe = blkno / tsc->stripe_chunksize;
stripe_off = blkno % tsc->stripe_chunksize;
- /* where we are inside the strip */
+ /* where we are inside the stripe */
stripe_devnr = stripe % tsc->stripe_num;
stripe_blknr = stripe / tsc->stripe_num;
