| geom_disk.c (97075) | geom_disk.c (97317) |
|---|---|
| 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 97075 2002-05-21 19:50:04Z phk $ | 35 * $FreeBSD: head/sys/geom/geom_disk.c 97317 2002-05-26 17:35:14Z 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> --- 161 unchanged lines hidden (view full) --- 205 dev = g_malloc(sizeof *dev, M_WAITOK | M_ZERO); 206 dp->d_dev = dev; 207 dp->d_devsw = cdevsw; 208 dev->si_devsw = cdevsw; 209 dev->si_disk = dp; 210 dev->si_udev = dkmakeminor(unit, WHOLE_DISK_SLICE, RAW_PART); 211 g_topology_lock(); 212 gp = g_new_geomf(&g_disk_class, "%s%d", cdevsw->d_name, unit); | 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> --- 161 unchanged lines hidden (view full) --- 205 dev = g_malloc(sizeof *dev, M_WAITOK | M_ZERO); 206 dp->d_dev = dev; 207 dp->d_devsw = cdevsw; 208 dev->si_devsw = cdevsw; 209 dev->si_disk = dp; 210 dev->si_udev = dkmakeminor(unit, WHOLE_DISK_SLICE, RAW_PART); 211 g_topology_lock(); 212 gp = g_new_geomf(&g_disk_class, "%s%d", cdevsw->d_name, unit); |
| 213 strcpy(dev->si_name, gp->name); |
|
| 213 gp->start = g_disk_start; 214 gp->access = g_disk_access; 215 gp->softc = dp; 216 dp->d_softc = gp; 217 pp = g_new_providerf(gp, "%s", gp->name); 218 g_error_provider(pp, 0); 219 g_topology_unlock(); 220 mtx_lock(&Giant); --- 39 unchanged lines hidden --- | 214 gp->start = g_disk_start; 215 gp->access = g_disk_access; 216 gp->softc = dp; 217 dp->d_softc = gp; 218 pp = g_new_providerf(gp, "%s", gp->name); 219 g_error_provider(pp, 0); 220 g_topology_unlock(); 221 mtx_lock(&Giant); --- 39 unchanged lines hidden --- |