Deleted Added
full compact
udf_vfsops.c (162647) udf_vfsops.c (164033)
1/*-
2 * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
3 * 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

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
3 * 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

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/fs/udf/udf_vfsops.c 162647 2006-09-26 04:12:49Z tegge $
26 * $FreeBSD: head/sys/fs/udf/udf_vfsops.c 164033 2006-11-06 13:42:10Z rwatson $
27 */
28
29/* udf_vfsops.c */
30/* Implement the VFS side of things */
31
32/*
33 * Ok, here's how it goes. The UDF specs are pretty clear on how each data
34 * structure is made up, but not very clear on how they relate to each other.

--- 44 unchanged lines hidden (view full) ---

79#include <sys/conf.h>
80#include <sys/dirent.h>
81#include <sys/fcntl.h>
82#include <sys/iconv.h>
83#include <sys/kernel.h>
84#include <sys/malloc.h>
85#include <sys/mount.h>
86#include <sys/namei.h>
27 */
28
29/* udf_vfsops.c */
30/* Implement the VFS side of things */
31
32/*
33 * Ok, here's how it goes. The UDF specs are pretty clear on how each data
34 * structure is made up, but not very clear on how they relate to each other.

--- 44 unchanged lines hidden (view full) ---

79#include <sys/conf.h>
80#include <sys/dirent.h>
81#include <sys/fcntl.h>
82#include <sys/iconv.h>
83#include <sys/kernel.h>
84#include <sys/malloc.h>
85#include <sys/mount.h>
86#include <sys/namei.h>
87#include <sys/priv.h>
87#include <sys/proc.h>
88#include <sys/queue.h>
89#include <sys/vnode.h>
90#include <sys/endian.h>
91
92#include <geom/geom.h>
93#include <geom/geom_vfs.h>
94

--- 138 unchanged lines hidden (view full) ---

233 if (vn_isdisk(devvp, &error) == 0) {
234 vput(devvp);
235 return (error);
236 }
237
238 /* Check the access rights on the mount device */
239 error = VOP_ACCESS(devvp, VREAD, td->td_ucred, td);
240 if (error)
88#include <sys/proc.h>
89#include <sys/queue.h>
90#include <sys/vnode.h>
91#include <sys/endian.h>
92
93#include <geom/geom.h>
94#include <geom/geom_vfs.h>
95

--- 138 unchanged lines hidden (view full) ---

234 if (vn_isdisk(devvp, &error) == 0) {
235 vput(devvp);
236 return (error);
237 }
238
239 /* Check the access rights on the mount device */
240 error = VOP_ACCESS(devvp, VREAD, td->td_ucred, td);
241 if (error)
241 error = suser(td);
242 error = priv_check(td, PRIV_VFS_MOUNT_PERM);
242 if (error) {
243 vput(devvp);
244 return (error);
245 }
246
247 if ((error = udf_mountfs(devvp, mp, td))) {
248 vrele(devvp);
249 return (error);

--- 562 unchanged lines hidden ---
243 if (error) {
244 vput(devvp);
245 return (error);
246 }
247
248 if ((error = udf_mountfs(devvp, mp, td))) {
249 vrele(devvp);
250 return (error);

--- 562 unchanged lines hidden ---