Deleted Added
full compact
geom_disk.c (94175) geom_disk.c (94287)
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_disk.c 94175 2002-04-08 08:00:40Z phk $
35 * $FreeBSD: head/sys/geom/geom_disk.c 94287 2002-04-09 15:43:32Z phk $
36 */
37
38#include "opt_geom.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/sysctl.h>

--- 97 unchanged lines hidden (view full) ---

141 dp->d_label.d_nsectors))
142 break;
143 else if (g_haveattr_int(bp, "GEOM::fwheads",
144 dp->d_label.d_ntracks))
145 break;
146 else if (g_haveattr_off_t(bp, "GEOM::mediasize",
147 dp->d_label.d_secsize * (off_t)dp->d_label.d_secperunit))
148 break;
36 */
37
38#include "opt_geom.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/sysctl.h>

--- 97 unchanged lines hidden (view full) ---

141 dp->d_label.d_nsectors))
142 break;
143 else if (g_haveattr_int(bp, "GEOM::fwheads",
144 dp->d_label.d_ntracks))
145 break;
146 else if (g_haveattr_off_t(bp, "GEOM::mediasize",
147 dp->d_label.d_secsize * (off_t)dp->d_label.d_secperunit))
148 break;
149 else if (g_haveattr_off_t(bp, "GEOM::frontstuff", 0))
150 break;
149 else if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
150 bp->bio_length == sizeof *gio) {
151 gio = (struct g_ioctl *)bp->bio_data;
152 mtx_lock(&Giant);
153 error = devsw(dev)->d_ioctl(dev, gio->cmd,
154 gio->data, gio->fflag, gio->td);
155 mtx_unlock(&Giant);
156 } else

--- 81 unchanged lines hidden ---
151 else if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
152 bp->bio_length == sizeof *gio) {
153 gio = (struct g_ioctl *)bp->bio_data;
154 mtx_lock(&Giant);
155 error = devsw(dev)->d_ioctl(dev, gio->cmd,
156 gio->data, gio->fflag, gio->td);
157 mtx_unlock(&Giant);
158 } else

--- 81 unchanged lines hidden ---