| vdev_disk.c (263397) | vdev_disk.c (265740) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 6 unchanged lines hidden (view full) --- 15 * If applicable, add the following below this CDDL HEADER, with the 16 * fields enclosed by brackets "[]" replaced with your own identifying 17 * information: Portions Copyright [yyyy] [name of copyright owner] 18 * 19 * CDDL HEADER END 20 */ 21/* 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 6 unchanged lines hidden (view full) --- 15 * If applicable, add the following below this CDDL HEADER, with the 16 * fields enclosed by brackets "[]" replaced with your own identifying 17 * information: Portions Copyright [yyyy] [name of copyright owner] 18 * 19 * CDDL HEADER END 20 */ 21/* 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. |
| 23 * Copyright (c) 2013 by Delphix. All rights reserved. | 23 * Copyright (c) 2012, 2014 by Delphix. All rights reserved. |
| 24 * Copyright 2013 Nexenta Systems, Inc. All rights reserved. 25 * Copyright (c) 2013 Joyent, Inc. All rights reserved. 26 */ 27 28#include <sys/zfs_context.h> 29#include <sys/spa_impl.h> 30#include <sys/refcount.h> 31#include <sys/vdev_disk.h> --- 510 unchanged lines hidden (view full) --- 542 pbsize = blksz; 543 } else { 544 VDEV_DEBUG("vdev_disk_open(\"%s\"): " 545 "both DKIOCGMEDIAINFO{,EXT} calls failed, %d\n", 546 vd->vdev_path, error); 547 pbsize = DEV_BSIZE; 548 } 549 | 24 * Copyright 2013 Nexenta Systems, Inc. All rights reserved. 25 * Copyright (c) 2013 Joyent, Inc. All rights reserved. 26 */ 27 28#include <sys/zfs_context.h> 29#include <sys/spa_impl.h> 30#include <sys/refcount.h> 31#include <sys/vdev_disk.h> --- 510 unchanged lines hidden (view full) --- 542 pbsize = blksz; 543 } else { 544 VDEV_DEBUG("vdev_disk_open(\"%s\"): " 545 "both DKIOCGMEDIAINFO{,EXT} calls failed, %d\n", 546 vd->vdev_path, error); 547 pbsize = DEV_BSIZE; 548 } 549 |
| 550 *ashift = highbit(MAX(pbsize, SPA_MINBLOCKSIZE)) - 1; | 550 *ashift = highbit64(MAX(pbsize, SPA_MINBLOCKSIZE)) - 1; |
| 551 552 if (vd->vdev_wholedisk == 1) { 553 int wce = 1; 554 555 if (error == 0) { 556 /* 557 * If we have the capability to expand, we'd have 558 * found out via success from DKIOCGMEDIAINFO{,EXT}. --- 382 unchanged lines hidden --- | 551 552 if (vd->vdev_wholedisk == 1) { 553 int wce = 1; 554 555 if (error == 0) { 556 /* 557 * If we have the capability to expand, we'd have 558 * found out via success from DKIOCGMEDIAINFO{,EXT}. --- 382 unchanged lines hidden --- |