| geom_dev.c (93250) | geom_dev.c (93326) |
|---|---|
| 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 --- 18 unchanged lines hidden (view full) --- 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * | 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 --- 18 unchanged lines hidden (view full) --- 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * $FreeBSD: head/sys/geom/geom_dev.c 93250 2002-03-26 22:07:38Z phk $ | 35 * $FreeBSD: head/sys/geom/geom_dev.c 93326 2002-03-28 10:09:24Z phk $ |
| 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/malloc.h> 41#include <sys/kernel.h> 42#include <sys/conf.h> 43#include <sys/bio.h> --- 108 unchanged lines hidden (view full) --- 152 printf("g_bsd_taste: error %d Sectors are %d bytes\n", 153 error, secsize); 154 } 155 j = sizeof mediasize; 156 error = g_io_getattr("GEOM::mediasize", cp, &j, &mediasize); 157 if (error) { 158 mediasize = 0; 159 printf("g_error %d Mediasize is %lld bytes\n", | 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/malloc.h> 41#include <sys/kernel.h> 42#include <sys/conf.h> 43#include <sys/bio.h> --- 108 unchanged lines hidden (view full) --- 152 printf("g_bsd_taste: error %d Sectors are %d bytes\n", 153 error, secsize); 154 } 155 j = sizeof mediasize; 156 error = g_io_getattr("GEOM::mediasize", cp, &j, &mediasize); 157 if (error) { 158 mediasize = 0; 159 printf("g_error %d Mediasize is %lld bytes\n", |
| 160 error, mediasize); | 160 error, (long long)mediasize); |
| 161 } 162 g_topology_lock(); 163 g_access_rel(cp, -1, 0, 0); 164 g_topology_unlock(); 165 } else { 166 secsize = 512; 167 mediasize = 0; 168 } 169 mtx_lock(&Giant); 170 if (mediasize != 0) 171 printf("GEOM: \"%s\" %lld bytes in %lld sectors of %u bytes\n", | 161 } 162 g_topology_lock(); 163 g_access_rel(cp, -1, 0, 0); 164 g_topology_unlock(); 165 } else { 166 secsize = 512; 167 mediasize = 0; 168 } 169 mtx_lock(&Giant); 170 if (mediasize != 0) 171 printf("GEOM: \"%s\" %lld bytes in %lld sectors of %u bytes\n", |
| 172 pp->name, mediasize, mediasize / secsize, secsize); | 172 pp->name, (long long)mediasize, 173 (long long)mediasize / secsize, secsize); |
| 173 else 174 printf("GEOM: \"%s\" (size unavailable)\n", pp->name); 175 dev = make_dev(&g_dev_cdevsw, unit++, 176 UID_ROOT, GID_WHEEL, 0600, gp->name); 177 gp->softc = dev; 178 dev->si_drv1 = gp; 179 dev->si_drv2 = cp; 180 mtx_unlock(&Giant); --- 210 unchanged lines hidden --- | 174 else 175 printf("GEOM: \"%s\" (size unavailable)\n", pp->name); 176 dev = make_dev(&g_dev_cdevsw, unit++, 177 UID_ROOT, GID_WHEEL, 0600, gp->name); 178 gp->softc = dev; 179 dev->si_drv1 = gp; 180 dev->si_drv2 = cp; 181 mtx_unlock(&Giant); --- 210 unchanged lines hidden --- |