| geom_mbr.c (230643) | geom_mbr.c (243333) |
|---|---|
| 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 --- 17 unchanged lines hidden (view full) --- 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 */ 32 33#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 --- 17 unchanged lines hidden (view full) --- 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/geom/geom_mbr.c 230643 2012-01-28 14:00:21Z attilio $"); | 34__FBSDID("$FreeBSD: head/sys/geom/geom_mbr.c 243333 2012-11-20 12:32:18Z jh $"); |
| 35 36#include <sys/param.h> 37#include <sys/errno.h> 38#include <sys/endian.h> 39#include <sys/systm.h> 40#include <sys/sysctl.h> 41#include <sys/kernel.h> 42#include <sys/fcntl.h> --- 435 unchanged lines hidden (view full) --- 478 if ((dp[0].dp_flag & 0x7f) == 0 && 479 dp[0].dp_size != 0 && dp[0].dp_typ != 0) { 480 g_topology_lock(); 481 g_slice_config(gp, slice, G_SLICE_CONFIG_SET, 482 (((off_t)dp[0].dp_start) << 9ULL) + off, 483 ((off_t)dp[0].dp_size) << 9ULL, 484 sectorsize, 485 "%*.*s%d", | 35 36#include <sys/param.h> 37#include <sys/errno.h> 38#include <sys/endian.h> 39#include <sys/systm.h> 40#include <sys/sysctl.h> 41#include <sys/kernel.h> 42#include <sys/fcntl.h> --- 435 unchanged lines hidden (view full) --- 478 if ((dp[0].dp_flag & 0x7f) == 0 && 479 dp[0].dp_size != 0 && dp[0].dp_typ != 0) { 480 g_topology_lock(); 481 g_slice_config(gp, slice, G_SLICE_CONFIG_SET, 482 (((off_t)dp[0].dp_start) << 9ULL) + off, 483 ((off_t)dp[0].dp_size) << 9ULL, 484 sectorsize, 485 "%*.*s%d", |
| 486 strlen(gp->name) - 1, 487 strlen(gp->name) - 1, | 486 (int)strlen(gp->name) - 1, 487 (int)strlen(gp->name) - 1, |
| 488 gp->name, 489 slice + 5); 490 g_topology_unlock(); 491 ms->type[slice] = dp[0].dp_typ; 492 slice++; 493 } 494 if (dp[1].dp_flag != 0) 495 break; --- 27 unchanged lines hidden --- | 488 gp->name, 489 slice + 5); 490 g_topology_unlock(); 491 ms->type[slice] = dp[0].dp_typ; 492 slice++; 493 } 494 if (dp[1].dp_flag != 0) 495 break; --- 27 unchanged lines hidden --- |