Deleted Added
full compact
scsi_ctl.c (268694) scsi_ctl.c (268697)
1/*-
2 * Copyright (c) 2008, 2009 Silicon Graphics International Corp.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 22 unchanged lines hidden (view full) ---

31 */
32/*
33 * Peripheral driver interface between CAM and CTL (CAM Target Layer).
34 *
35 * Author: Ken Merry <ken@FreeBSD.org>
36 */
37
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008, 2009 Silicon Graphics International Corp.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 22 unchanged lines hidden (view full) ---

31 */
32/*
33 * Peripheral driver interface between CAM and CTL (CAM Target Layer).
34 *
35 * Author: Ken Merry <ken@FreeBSD.org>
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: stable/10/sys/cam/ctl/scsi_ctl.c 268694 2014-07-15 17:16:06Z mav $");
39__FBSDID("$FreeBSD: stable/10/sys/cam/ctl/scsi_ctl.c 268697 2014-07-15 17:18:50Z mav $");
40
41#include <sys/param.h>
42#include <sys/queue.h>
43#include <sys/systm.h>
44#include <sys/kernel.h>
45#include <sys/lock.h>
46#include <sys/mutex.h>
47#include <sys/condvar.h>

--- 752 unchanged lines hidden (view full) ---

800 /*
801 * We're done, send status back.
802 */
803 flags |= CAM_SEND_STATUS;
804 if (io == NULL) {
805 scsi_status = SCSI_STATUS_BUSY;
806 csio->sense_len = 0;
807 } else if ((io->io_hdr.status & CTL_STATUS_MASK) ==
40
41#include <sys/param.h>
42#include <sys/queue.h>
43#include <sys/systm.h>
44#include <sys/kernel.h>
45#include <sys/lock.h>
46#include <sys/mutex.h>
47#include <sys/condvar.h>

--- 752 unchanged lines hidden (view full) ---

800 /*
801 * We're done, send status back.
802 */
803 flags |= CAM_SEND_STATUS;
804 if (io == NULL) {
805 scsi_status = SCSI_STATUS_BUSY;
806 csio->sense_len = 0;
807 } else if ((io->io_hdr.status & CTL_STATUS_MASK) ==
808 CTL_CMD_ABORTED) {
808 CTL_CMD_ABORTED &&
809 (io->io_hdr.flags & CTL_FLAG_ABORT_STATUS) == 0) {
809 io->io_hdr.flags &= ~CTL_FLAG_STATUS_QUEUED;
810
811 /*
812 * If this command was aborted, we don't
813 * need to send status back to the SIM.
814 * Just free the CTIO and ctl_io, and
815 * recycle the ATIO back to the SIM.
816 */

--- 1391 unchanged lines hidden ---
810 io->io_hdr.flags &= ~CTL_FLAG_STATUS_QUEUED;
811
812 /*
813 * If this command was aborted, we don't
814 * need to send status back to the SIM.
815 * Just free the CTIO and ctl_io, and
816 * recycle the ATIO back to the SIM.
817 */

--- 1391 unchanged lines hidden ---