| geom_disk.c (109563) | geom_disk.c (109623) |
|---|---|
| 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 109563 2003-01-20 11:29:07Z phk $ | 35 * $FreeBSD: head/sys/geom/geom_disk.c 109623 2003-01-21 08:56:16Z alfred $ |
| 36 */ 37 38#include "opt_geom.h" 39#ifndef NO_GEOM 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> --- 201 unchanged lines hidden (view full) --- 245 246 247 248dev_t 249disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, struct cdevsw *proto) 250{ 251 dev_t dev; 252 | 36 */ 37 38#include "opt_geom.h" 39#ifndef NO_GEOM 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> --- 201 unchanged lines hidden (view full) --- 245 246 247 248dev_t 249disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, struct cdevsw *proto) 250{ 251 dev_t dev; 252 |
| 253 dev = g_malloc(sizeof *dev, M_WAITOK | M_ZERO); | 253 dev = g_malloc(sizeof *dev, M_ZERO); |
| 254 dp->d_dev = dev; 255 dp->d_devsw = cdevsw; 256 dev->si_devsw = cdevsw; 257 dev->si_disk = dp; 258 dev->si_udev = dkmakeminor(unit, 1, RAW_PART); 259 sprintf(dev->si_name, "%s%d", cdevsw->d_name, unit); 260 g_call_me(g_disk_create, dev); 261 return (dev); --- 59 unchanged lines hidden --- | 254 dp->d_dev = dev; 255 dp->d_devsw = cdevsw; 256 dev->si_devsw = cdevsw; 257 dev->si_disk = dp; 258 dev->si_udev = dkmakeminor(unit, 1, RAW_PART); 259 sprintf(dev->si_name, "%s%d", cdevsw->d_name, unit); 260 g_call_me(g_disk_create, dev); 261 return (dev); --- 59 unchanged lines hidden --- |