| geom_disk.c (251654) | geom_disk.c (252657) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 20 unchanged lines hidden (view full) --- 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 */ 35 36#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 20 unchanged lines hidden (view full) --- 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 */ 35 36#include <sys/cdefs.h> |
| 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 251654 2013-06-12 13:36:20Z mav $"); | 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 252657 2013-07-03 23:46:30Z smh $"); |
| 38 39#include "opt_geom.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> 44#include <sys/sysctl.h> 45#include <sys/bio.h> --- 97 unchanged lines hidden (view full) --- 143 } 144 pp->mediasize = dp->d_mediasize; 145 pp->sectorsize = dp->d_sectorsize; 146 if (dp->d_maxsize == 0) { 147 printf("WARNING: Disk drive %s%d has no d_maxsize\n", 148 dp->d_name, dp->d_unit); 149 dp->d_maxsize = DFLTPHYS; 150 } | 38 39#include "opt_geom.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> 44#include <sys/sysctl.h> 45#include <sys/bio.h> --- 97 unchanged lines hidden (view full) --- 143 } 144 pp->mediasize = dp->d_mediasize; 145 pp->sectorsize = dp->d_sectorsize; 146 if (dp->d_maxsize == 0) { 147 printf("WARNING: Disk drive %s%d has no d_maxsize\n", 148 dp->d_name, dp->d_unit); 149 dp->d_maxsize = DFLTPHYS; 150 } |
| 151 if (dp->d_flags & DISKFLAG_CANDELETE) { 152 if (bootverbose && dp->d_delmaxsize == 0) { 153 printf("WARNING: Disk drive %s%d has no d_delmaxsize\n", 154 dp->d_name, dp->d_unit); 155 dp->d_delmaxsize = dp->d_maxsize; | 151 if (dp->d_delmaxsize == 0) { 152 if (bootverbose && dp->d_flags & DISKFLAG_CANDELETE) { 153 printf("WARNING: Disk drive %s%d has no " 154 "d_delmaxsize\n", dp->d_name, dp->d_unit); |
| 156 } | 155 } |
| 157 } else { 158 dp->d_delmaxsize = 0; | 156 dp->d_delmaxsize = dp->d_maxsize; |
| 159 } 160 pp->stripeoffset = dp->d_stripeoffset; 161 pp->stripesize = dp->d_stripesize; 162 dp->d_flags |= DISKFLAG_OPEN; 163 } else if ((pp->acr + pp->acw + pp->ace) > 0 && (r + w + e) == 0) { 164 if (dp->d_close != NULL) { 165 g_disk_lock_giant(dp); 166 error = dp->d_close(dp); --- 457 unchanged lines hidden (view full) --- 624 625 return (g_malloc(sizeof(struct disk), M_WAITOK | M_ZERO)); 626} 627 628void 629disk_create(struct disk *dp, int version) 630{ 631 | 157 } 158 pp->stripeoffset = dp->d_stripeoffset; 159 pp->stripesize = dp->d_stripesize; 160 dp->d_flags |= DISKFLAG_OPEN; 161 } else if ((pp->acr + pp->acw + pp->ace) > 0 && (r + w + e) == 0) { 162 if (dp->d_close != NULL) { 163 g_disk_lock_giant(dp); 164 error = dp->d_close(dp); --- 457 unchanged lines hidden (view full) --- 622 623 return (g_malloc(sizeof(struct disk), M_WAITOK | M_ZERO)); 624} 625 626void 627disk_create(struct disk *dp, int version) 628{ 629 |
| 632 if (version != DISK_VERSION_02) { | 630 if (version != DISK_VERSION) { |
| 633 printf("WARNING: Attempt to add disk %s%d %s", 634 dp->d_name, dp->d_unit, 635 " using incompatible ABI version of disk(9)\n"); 636 printf("WARNING: Ignoring disk %s%d\n", 637 dp->d_name, dp->d_unit); 638 return; 639 } 640 KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); --- 129 unchanged lines hidden --- | 631 printf("WARNING: Attempt to add disk %s%d %s", 632 dp->d_name, dp->d_unit, 633 " using incompatible ABI version of disk(9)\n"); 634 printf("WARNING: Ignoring disk %s%d\n", 635 dp->d_name, dp->d_unit); 636 return; 637 } 638 KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); --- 129 unchanged lines hidden --- |