Deleted Added
full compact
ctl_backend_block.c (264886) ctl_backend_block.c (267429)
1/*-
2 * Copyright (c) 2003 Silicon Graphics International Corp.
3 * Copyright (c) 2009-2011 Spectra Logic Corporation
4 * Copyright (c) 2012 The FreeBSD Foundation
5 * All rights reserved.
6 *
7 * Portions of this software were developed by Edward Tomasz Napierala
8 * under sponsorship from the FreeBSD Foundation.

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

35 * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_backend_block.c#5 $
36 */
37/*
38 * CAM Target Layer driver backend for block devices.
39 *
40 * Author: Ken Merry <ken@FreeBSD.org>
41 */
42#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003 Silicon Graphics International Corp.
3 * Copyright (c) 2009-2011 Spectra Logic Corporation
4 * Copyright (c) 2012 The FreeBSD Foundation
5 * All rights reserved.
6 *
7 * Portions of this software were developed by Edward Tomasz Napierala
8 * under sponsorship from the FreeBSD Foundation.

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

35 * $Id: //depot/users/kenm/FreeBSD-test2/sys/cam/ctl/ctl_backend_block.c#5 $
36 */
37/*
38 * CAM Target Layer driver backend for block devices.
39 *
40 * Author: Ken Merry <ken@FreeBSD.org>
41 */
42#include <sys/cdefs.h>
43__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_backend_block.c 264886 2014-04-24 16:19:49Z mav $");
43__FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_backend_block.c 267429 2014-06-12 21:50:46Z mav $");
44
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/kernel.h>
48#include <sys/types.h>
49#include <sys/kthread.h>
50#include <sys/bio.h>
51#include <sys/fcntl.h>

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

2108
2109 req->status = CTL_LUN_OK;
2110
2111 return (retval);
2112
2113bailout_error:
2114 req->status = CTL_LUN_ERROR;
2115
44
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/kernel.h>
48#include <sys/types.h>
49#include <sys/kthread.h>
50#include <sys/bio.h>
51#include <sys/fcntl.h>

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

2108
2109 req->status = CTL_LUN_OK;
2110
2111 return (retval);
2112
2113bailout_error:
2114 req->status = CTL_LUN_ERROR;
2115
2116 if (be_lun->io_taskqueue != NULL)
2117 taskqueue_free(be_lun->io_taskqueue);
2116 ctl_be_block_close(be_lun);
2118 ctl_be_block_close(be_lun);
2117
2118 free(be_lun->dev_path, M_CTLBLK);
2119 if (be_lun->dev_path != NULL)
2120 free(be_lun->dev_path, M_CTLBLK);
2121 if (be_lun->lun_zone != NULL)
2122 uma_zdestroy(be_lun->lun_zone);
2123 mtx_destroy(&be_lun->lock);
2119 free(be_lun, M_CTLBLK);
2120
2121 return (retval);
2122}
2123
2124static int
2125ctl_be_block_rm(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
2126{

--- 446 unchanged lines hidden ---
2124 free(be_lun, M_CTLBLK);
2125
2126 return (retval);
2127}
2128
2129static int
2130ctl_be_block_rm(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
2131{

--- 446 unchanged lines hidden ---