| ext2_vfsops.c (55313) | ext2_vfsops.c (55756) |
|---|---|
| 1/* 2 * modified for EXT2FS support in Lites 1.1 3 * 4 * Aug 1995, Godmar Back (gback@cs.utah.edu) 5 * University of Utah, Department of Computer Science 6 */ 7/* 8 * Copyright (c) 1989, 1991, 1993, 1994 --- 23 unchanged lines hidden (view full) --- 32 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 37 * SUCH DAMAGE. 38 * 39 * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 | 1/* 2 * modified for EXT2FS support in Lites 1.1 3 * 4 * Aug 1995, Godmar Back (gback@cs.utah.edu) 5 * University of Utah, Department of Computer Science 6 */ 7/* 8 * Copyright (c) 1989, 1991, 1993, 1994 --- 23 unchanged lines hidden (view full) --- 32 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 37 * SUCH DAMAGE. 38 * 39 * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 |
| 40 * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_vfsops.c 55313 2000-01-02 17:40:02Z bde $ | 40 * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_vfsops.c 55756 2000-01-10 12:04:27Z phk $ |
| 41 */ 42 43#include "opt_quota.h" 44 45#include <sys/param.h> 46#include <sys/systm.h> 47#include <sys/namei.h> 48#include <sys/proc.h> --- 214 unchanged lines hidden (view full) --- 263 * and verify that it refers to a sensible block device. 264 */ 265 NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, p); 266 if ((error = namei(ndp)) != 0) 267 return (error); 268 NDFREE(ndp, NDF_ONLY_PNBUF); 269 devvp = ndp->ni_vp; 270 | 41 */ 42 43#include "opt_quota.h" 44 45#include <sys/param.h> 46#include <sys/systm.h> 47#include <sys/namei.h> 48#include <sys/proc.h> --- 214 unchanged lines hidden (view full) --- 263 * and verify that it refers to a sensible block device. 264 */ 265 NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, p); 266 if ((error = namei(ndp)) != 0) 267 return (error); 268 NDFREE(ndp, NDF_ONLY_PNBUF); 269 devvp = ndp->ni_vp; 270 |
| 271 if (!vn_isdisk(devvp)) { | 271 if (!vn_isdisk(devvp, &error)) { |
| 272 vrele(devvp); | 272 vrele(devvp); |
| 273 return (ENOTBLK); | 273 return (error); |
| 274 } 275 276 /* 277 * If mount by non-root, then verify that user has necessary 278 * permissions on the device. 279 */ 280 if (p->p_ucred->cr_uid != 0) { 281 accessmode = VREAD; --- 913 unchanged lines hidden --- | 274 } 275 276 /* 277 * If mount by non-root, then verify that user has necessary 278 * permissions on the device. 279 */ 280 if (p->p_ucred->cr_uid != 0) { 281 accessmode = VREAD; --- 913 unchanged lines hidden --- |