| cd9660_vfsops.c (46676) | cd9660_vfsops.c (47640) |
|---|---|
| 1/*- 2 * Copyright (c) 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 | 1/*- 2 * Copyright (c) 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 |
| 39 * $Id: cd9660_vfsops.c,v 1.54 1999/05/07 10:10:46 phk Exp $ | 39 * $Id: cd9660_vfsops.c,v 1.55 1999/05/08 06:39:32 phk Exp $ |
| 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/namei.h> 45#include <sys/proc.h> 46#include <sys/kernel.h> 47#include <sys/vnode.h> --- 172 unchanged lines hidden (view full) --- 220 if ((error = namei(ndp))) 221 return (error); 222 devvp = ndp->ni_vp; 223 224 if (devvp->v_type != VBLK) { 225 vrele(devvp); 226 return ENOTBLK; 227 } | 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/namei.h> 45#include <sys/proc.h> 46#include <sys/kernel.h> 47#include <sys/vnode.h> --- 172 unchanged lines hidden (view full) --- 220 if ((error = namei(ndp))) 221 return (error); 222 devvp = ndp->ni_vp; 223 224 if (devvp->v_type != VBLK) { 225 vrele(devvp); 226 return ENOTBLK; 227 } |
| 228 if (major(devvp->v_rdev) >= nblkdev || 229 bdevsw(devvp->v_rdev) == NULL) { | 228 if (bdevsw(devvp->v_rdev) == NULL) { |
| 230 vrele(devvp); 231 return ENXIO; 232 } 233 234 /* 235 * Verify that user has necessary permissions on the device, 236 * or has superuser abilities 237 */ --- 720 unchanged lines hidden --- | 229 vrele(devvp); 230 return ENXIO; 231 } 232 233 /* 234 * Verify that user has necessary permissions on the device, 235 * or has superuser abilities 236 */ --- 720 unchanged lines hidden --- |