Module Name: src
Committed By: riastradh
Date: Fri Apr 21 18:45:13 UTC 2023
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
dk(4): dkdump: Simplify. No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.146 src/sys/dev/dkwedge/dk.c:1.147
--- src/sys/dev/dkwedge/dk.c:1.146 Fri Apr 21 18:44:58 2023
+++ src/sys/dev/dkwedge/dk.c Fri Apr 21 18:45:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.146 2023/04/21 18:44:58 riastradh Exp $ */
+/* $NetBSD: dk.c,v 1.147 2023/04/21 18:45:13 riastradh Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.146 2023/04/21 18:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.147 2023/04/21 18:45:13 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -1834,7 +1834,6 @@ dkdump(dev_t dev, daddr_t blkno, void *v
struct dkwedge_softc *sc = dkwedge_lookup(dev);
const struct bdevsw *bdev;
uint64_t p_size, p_offset;
- int rv = 0;
if (sc == NULL)
return ENXIO;
@@ -1845,14 +1844,10 @@ dkdump(dev_t dev, daddr_t blkno, void *v
if (strcmp(sc->sc_ptype, DKW_PTYPE_SWAP) != 0 &&
strcmp(sc->sc_ptype, DKW_PTYPE_RAID) != 0 &&
- strcmp(sc->sc_ptype, DKW_PTYPE_CGD) != 0) {
- rv = ENXIO;
- goto out;
- }
- if (size % DEV_BSIZE != 0) {
- rv = EINVAL;
- goto out;
- }
+ strcmp(sc->sc_ptype, DKW_PTYPE_CGD) != 0)
+ return ENXIO;
+ if (size % DEV_BSIZE != 0)
+ return EINVAL;
p_offset = sc->sc_offset << sc->sc_parent->dk_blkshift;
p_size = dkwedge_size(sc) << sc->sc_parent->dk_blkshift;
@@ -1861,15 +1856,11 @@ dkdump(dev_t dev, daddr_t blkno, void *v
printf("%s: blkno (%" PRIu64 ") + size / DEV_BSIZE (%zu) > "
"p_size (%" PRIu64 ")\n", __func__, blkno,
size/DEV_BSIZE, p_size);
- rv = EINVAL;
- goto out;
+ return EINVAL;
}
bdev = bdevsw_lookup(sc->sc_pdev);
- rv = (*bdev->d_dump)(sc->sc_pdev, blkno + p_offset, va, size);
-
-out:
- return rv;
+ return (*bdev->d_dump)(sc->sc_pdev, blkno + p_offset, va, size);
}
/*
