| ffs_vfsops.c (46676) | ffs_vfsops.c (47640) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1991, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 | 1/* 2 * Copyright (c) 1989, 1991, 1993, 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 |
| 34 * $Id: ffs_vfsops.c,v 1.97 1999/05/07 10:11:33 phk Exp $ | 34 * $Id: ffs_vfsops.c,v 1.98 1999/05/08 06:40:22 phk Exp $ |
| 35 */ 36 37#include "opt_quota.h" 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/namei.h> 42#include <sys/proc.h> --- 242 unchanged lines hidden (view full) --- 285 } 286 287 devvp = ndp->ni_vp; 288 289 if (devvp->v_type != VBLK) { 290 err = ENOTBLK; 291 goto error_2; 292 } | 35 */ 36 37#include "opt_quota.h" 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/namei.h> 42#include <sys/proc.h> --- 242 unchanged lines hidden (view full) --- 285 } 286 287 devvp = ndp->ni_vp; 288 289 if (devvp->v_type != VBLK) { 290 err = ENOTBLK; 291 goto error_2; 292 } |
| 293 if (major(devvp->v_rdev) >= nblkdev || 294 bdevsw(devvp->v_rdev) == NULL) { | 293 if (bdevsw(devvp->v_rdev) == NULL) { |
| 295 err = ENXIO; 296 goto error_2; 297 } 298 299 /* 300 * If mount by non-root, then verify that user has necessary 301 * permissions on the device. 302 */ --- 998 unchanged lines hidden --- | 294 err = ENXIO; 295 goto error_2; 296 } 297 298 /* 299 * If mount by non-root, then verify that user has necessary 300 * permissions on the device. 301 */ --- 998 unchanged lines hidden --- |