Module Name: src
Committed By: christos
Date: Fri Jan 2 01:13:00 UTC 2015
Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c
src/sys/dev: cgd.c
Log Message:
these call dk_ioctl, no need to call disk_ioctl anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/cgd.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/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.67 src/sys/arch/xen/xen/xbd_xenbus.c:1.68
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.67 Wed Dec 31 15:39:07 2014
+++ src/sys/arch/xen/xen/xbd_xenbus.c Thu Jan 1 20:13:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.67 2014/12/31 20:39:07 christos Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.68 2015/01/02 01:13:00 christos Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.67 2014/12/31 20:39:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.68 2015/01/02 01:13:00 christos Exp $");
#include "opt_xen.h"
@@ -847,10 +847,6 @@ xbdioctl(dev_t dev, u_long cmd, void *da
dev, cmd, data, flag, l));
dksc = &sc->sc_dksc;
- error = disk_ioctl(&sc->sc_dksc.sc_dkdev, dev, cmd, data, flag, l);
- if (error != EPASSTHROUGH)
- return (error);
-
switch (cmd) {
case DIOCSSTRATEGY:
error = EOPNOTSUPP;
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.94 src/sys/dev/cgd.c:1.95
--- src/sys/dev/cgd.c:1.94 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/cgd.c Thu Jan 1 20:13:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.94 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: cgd.c,v 1.95 2015/01/02 01:13:00 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.94 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.95 2015/01/02 01:13:00 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -548,7 +548,6 @@ cgdioctl(dev_t dev, u_long cmd, void *da
struct dk_softc *dksc;
int part = DISKPART(dev);
int pmask = 1 << part;
- int error;
DPRINTF_FOLLOW(("cgdioctl(0x%"PRIx64", %ld, %p, %d, %p)\n",
dev, cmd, data, flag, l));
@@ -567,10 +566,6 @@ cgdioctl(dev_t dev, u_long cmd, void *da
break;
}
- error = disk_ioctl(&dksc->sc_dkdev, dev, cmd, data, flag, l);
- if (error != EPASSTHROUGH)
- return (error);
-
switch (cmd) {
case CGDIOCSET:
if (dksc->sc_flags & DKF_INITED)
