Deleted Added
full compact
nvd.c (285915) nvd.c (291214)
1/*-
2 * Copyright (C) 2012-2013 Intel Corporation
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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 2012-2013 Intel Corporation
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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: stable/10/sys/dev/nvd/nvd.c 285915 2015-07-27 15:32:37Z jimharris $");
28__FBSDID("$FreeBSD: stable/10/sys/dev/nvd/nvd.c 291214 2015-11-23 17:27:29Z jimharris $");
29
30#include <sys/param.h>
31#include <sys/bio.h>
32#include <sys/kernel.h>
33#include <sys/malloc.h>
34#include <sys/module.h>
35#include <sys/systm.h>
36#include <sys/taskqueue.h>

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

274 disk->d_ioctl = nvd_ioctl;
275 disk->d_name = NVD_STR;
276 disk->d_drv1 = ndisk;
277
278 disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns);
279 disk->d_sectorsize = nvme_ns_get_sector_size(ns);
280 disk->d_mediasize = (off_t)nvme_ns_get_size(ns);
281 disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns);
29
30#include <sys/param.h>
31#include <sys/bio.h>
32#include <sys/kernel.h>
33#include <sys/malloc.h>
34#include <sys/module.h>
35#include <sys/systm.h>
36#include <sys/taskqueue.h>

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

274 disk->d_ioctl = nvd_ioctl;
275 disk->d_name = NVD_STR;
276 disk->d_drv1 = ndisk;
277
278 disk->d_maxsize = nvme_ns_get_max_io_xfer_size(ns);
279 disk->d_sectorsize = nvme_ns_get_sector_size(ns);
280 disk->d_mediasize = (off_t)nvme_ns_get_size(ns);
281 disk->d_delmaxsize = (off_t)nvme_ns_get_size(ns);
282 disk->d_stripesize = nvme_ns_get_stripesize(ns);
282
283 if (TAILQ_EMPTY(&disk_head))
284 disk->d_unit = 0;
285 else
286 disk->d_unit =
287 TAILQ_LAST(&disk_head, disk_list)->disk->d_unit + 1;
288
289 disk->d_flags = 0;

--- 104 unchanged lines hidden ---
283
284 if (TAILQ_EMPTY(&disk_head))
285 disk->d_unit = 0;
286 else
287 disk->d_unit =
288 TAILQ_LAST(&disk_head, disk_list)->disk->d_unit + 1;
289
290 disk->d_flags = 0;

--- 104 unchanged lines hidden ---