Deleted Added
full compact
cd9660_vfsops.c (210172) cd9660_vfsops.c (213664)
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).

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

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
35 */
36
37#include <sys/cdefs.h>
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).

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

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
35 */
36
37#include <sys/cdefs.h>
38__FBSDID("$FreeBSD: head/sys/fs/cd9660/cd9660_vfsops.c 210172 2010-07-16 19:52:03Z jhb $");
38__FBSDID("$FreeBSD: head/sys/fs/cd9660/cd9660_vfsops.c 213664 2010-10-10 07:05:47Z kib $");
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/namei.h>
43#include <sys/priv.h>
44#include <sys/proc.h>
45#include <sys/kernel.h>
46#include <sys/vnode.h>

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

93/*
94 * VFS Operations.
95 */
96
97static int
98cd9660_cmount(struct mntarg *ma, void *data, int flags)
99{
100 struct iso_args args;
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/namei.h>
43#include <sys/priv.h>
44#include <sys/proc.h>
45#include <sys/kernel.h>
46#include <sys/vnode.h>

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

93/*
94 * VFS Operations.
95 */
96
97static int
98cd9660_cmount(struct mntarg *ma, void *data, int flags)
99{
100 struct iso_args args;
101 struct export_args exp;
101 int error;
102
103 error = copyin(data, &args, sizeof args);
104 if (error)
105 return (error);
102 int error;
103
104 error = copyin(data, &args, sizeof args);
105 if (error)
106 return (error);
107 vfs_oexport_conv(&args.export, &exp);
106
107 ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN);
108
109 ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN);
108 ma = mount_arg(ma, "export", &args.export, sizeof args.export);
110 ma = mount_arg(ma, "export", &exp, sizeof(exp));
109 ma = mount_argsu(ma, "cs_disk", args.cs_disk, 64);
110 ma = mount_argsu(ma, "cs_local", args.cs_local, 64);
111 ma = mount_argf(ma, "ssector", "%u", args.ssector);
112 ma = mount_argb(ma, !(args.flags & ISOFSMNT_NORRIP), "norrip");
113 ma = mount_argb(ma, args.flags & ISOFSMNT_GENS, "nogens");
114 ma = mount_argb(ma, args.flags & ISOFSMNT_EXTATT, "noextatt");
115 ma = mount_argb(ma, !(args.flags & ISOFSMNT_NOJOLIET), "nojoliet");
116 ma = mount_argb(ma,

--- 714 unchanged lines hidden ---
111 ma = mount_argsu(ma, "cs_disk", args.cs_disk, 64);
112 ma = mount_argsu(ma, "cs_local", args.cs_local, 64);
113 ma = mount_argf(ma, "ssector", "%u", args.ssector);
114 ma = mount_argb(ma, !(args.flags & ISOFSMNT_NORRIP), "norrip");
115 ma = mount_argb(ma, args.flags & ISOFSMNT_GENS, "nogens");
116 ma = mount_argb(ma, args.flags & ISOFSMNT_EXTATT, "noextatt");
117 ma = mount_argb(ma, !(args.flags & ISOFSMNT_NOJOLIET), "nojoliet");
118 ma = mount_argb(ma,

--- 714 unchanged lines hidden ---