| geom_disk.c (249940) | geom_disk.c (251616) |
|---|---|
| 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 249940 2013-04-26 16:22:54Z smh $"); | 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 251616 2013-06-11 10:06:07Z mav $"); |
| 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> --- 87 unchanged lines hidden (view full) --- 133 if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) { 134 if (dp->d_open != NULL) { 135 g_disk_lock_giant(dp); 136 error = dp->d_open(dp); 137 if (bootverbose && error != 0) 138 printf("Opened disk %s -> %d\n", 139 pp->name, error); 140 g_disk_unlock_giant(dp); | 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> --- 87 unchanged lines hidden (view full) --- 133 if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) { 134 if (dp->d_open != NULL) { 135 g_disk_lock_giant(dp); 136 error = dp->d_open(dp); 137 if (bootverbose && error != 0) 138 printf("Opened disk %s -> %d\n", 139 pp->name, error); 140 g_disk_unlock_giant(dp); |
| 141 if (error != 0) 142 return (error); |
|
| 141 } 142 pp->mediasize = dp->d_mediasize; 143 pp->sectorsize = dp->d_sectorsize; 144 if (dp->d_maxsize == 0) { 145 printf("WARNING: Disk drive %s%d has no d_maxsize\n", 146 dp->d_name, dp->d_unit); 147 dp->d_maxsize = DFLTPHYS; 148 } --- 596 unchanged lines hidden --- | 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 } --- 596 unchanged lines hidden --- |