| mfi_disk.c (171821) | mfi_disk.c (185035) |
|---|---|
| 1/*- 2 * Copyright (c) 2006 IronPort Systems 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) 2006 IronPort Systems 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: head/sys/dev/mfi/mfi_disk.c 171821 2007-08-13 19:29:17Z jhb $"); | 28__FBSDID("$FreeBSD: head/sys/dev/mfi/mfi_disk.c 185035 2008-11-17 23:30:19Z jhb $"); |
| 29 30#include "opt_mfi.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/kernel.h> 35#include <sys/selinfo.h> 36#include <sys/module.h> --- 94 unchanged lines hidden (view full) --- 131 } 132 device_printf(dev, "%juMB (%ju sectors) RAID volume '%s' is %s\n", 133 sectors / (1024 * 1024 / secsize), sectors, 134 ld_info->ld_config.properties.name, 135 state); 136 137 sc->ld_disk = disk_alloc(); 138 sc->ld_disk->d_drv1 = sc; | 29 30#include "opt_mfi.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/kernel.h> 35#include <sys/selinfo.h> 36#include <sys/module.h> --- 94 unchanged lines hidden (view full) --- 131 } 132 device_printf(dev, "%juMB (%ju sectors) RAID volume '%s' is %s\n", 133 sectors / (1024 * 1024 / secsize), sectors, 134 ld_info->ld_config.properties.name, 135 state); 136 137 sc->ld_disk = disk_alloc(); 138 sc->ld_disk->d_drv1 = sc; |
| 139 sc->ld_disk->d_maxsize = sc->ld_controller->mfi_max_io * secsize; | 139 sc->ld_disk->d_maxsize = min(sc->ld_controller->mfi_max_io * secsize, 140 (sc->ld_controller->mfi_max_sge - 1) * PAGE_SIZE); |
| 140 sc->ld_disk->d_name = "mfid"; 141 sc->ld_disk->d_open = mfi_disk_open; 142 sc->ld_disk->d_close = mfi_disk_close; 143 sc->ld_disk->d_strategy = mfi_disk_strategy; 144 sc->ld_disk->d_dump = mfi_disk_dump; 145 sc->ld_disk->d_unit = sc->ld_unit; 146 sc->ld_disk->d_sectorsize = secsize; 147 sc->ld_disk->d_mediasize = sectors * secsize; --- 158 unchanged lines hidden --- | 141 sc->ld_disk->d_name = "mfid"; 142 sc->ld_disk->d_open = mfi_disk_open; 143 sc->ld_disk->d_close = mfi_disk_close; 144 sc->ld_disk->d_strategy = mfi_disk_strategy; 145 sc->ld_disk->d_dump = mfi_disk_dump; 146 sc->ld_disk->d_unit = sc->ld_unit; 147 sc->ld_disk->d_sectorsize = secsize; 148 sc->ld_disk->d_mediasize = sectors * secsize; --- 158 unchanged lines hidden --- |