From 8fcf57f5f66081320a7273f6866e8b036f90efa6 Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Tue, 31 Oct 2000 22:07:02 +0000 Subject: [PATCH] Treat engine inquiry the same as path inquiry in xptioctl(). Return ENOTSUP for any opcode that is not supported by the XPT device. Add back a missing local declaration that seems to have been deleted by my last commit. --- sys/cam/cam_xpt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index ee56251bd369..66270ae3d9df 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -975,6 +975,7 @@ xptioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) } /* FALLTHROUGH */ case XPT_PATH_INQ: + case XPT_ENG_INQ: case XPT_SCAN_LUN: ccb = xpt_alloc_ccb(); @@ -1089,12 +1090,8 @@ xptioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) error = 0; break; } - case XPT_ENG_INQ: - case XPT_ENG_EXEC: - error = ENOTSUP; - break; default: - error = EINVAL; + error = ENOTSUP; break; } break; @@ -5874,6 +5871,7 @@ xpt_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, qfrozen = FALSE; if ((cts->valid & CCB_TRANS_TQ_VALID) != 0) { + int device_tagenb; /* * If we are transitioning from tags to no-tags or