summaryrefslogtreecommitdiffstats
path: root/sys/fs/cd9660
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2010-10-10 07:05:47 +0000
committerkib <kib@FreeBSD.org>2010-10-10 07:05:47 +0000
commit4036cd070dc5c10e56ee81b7b59fac9c3d1b21b5 (patch)
treea006cef67a086a26fbf62390901a1727666e6379 /sys/fs/cd9660
parentab9dd3ef5837b16243ea56cca50dce6f2709cb92 (diff)
downloadFreeBSD-src-4036cd070dc5c10e56ee81b7b59fac9c3d1b21b5.zip
FreeBSD-src-4036cd070dc5c10e56ee81b7b59fac9c3d1b21b5.tar.gz
The r184588 changed the layout of struct export_args, causing an ABI
breakage for old mount(2) syscall, since most struct <filesystem>_args embed export_args. The mount(2) is supposed to provide ABI compatibility for pre-nmount mount(8) binaries, so restore ABI to pre-r184588. Requested and reviewed by: bde MFC after: 2 weeks
Diffstat (limited to 'sys/fs/cd9660')
-rw-r--r--sys/fs/cd9660/cd9660_mount.h2
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/fs/cd9660/cd9660_mount.h b/sys/fs/cd9660/cd9660_mount.h
index 518677d..f59dfc0 100644
--- a/sys/fs/cd9660/cd9660_mount.h
+++ b/sys/fs/cd9660/cd9660_mount.h
@@ -40,7 +40,7 @@
*/
struct iso_args {
char *fspec; /* block special device to mount */
- struct export_args export; /* network export info */
+ struct oexport_args export; /* network export info */
int flags; /* mounting flags, see below */
int ssector; /* starting sector, 0 for 1st session */
char *cs_disk; /* disk charset for Joliet cs conversion */
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index e27daf8..77757f2 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -98,14 +98,16 @@ static int
cd9660_cmount(struct mntarg *ma, void *data, int flags)
{
struct iso_args args;
+ struct export_args exp;
int error;
error = copyin(data, &args, sizeof args);
if (error)
return (error);
+ vfs_oexport_conv(&args.export, &exp);
ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN);
- ma = mount_arg(ma, "export", &args.export, sizeof args.export);
+ ma = mount_arg(ma, "export", &exp, sizeof(exp));
ma = mount_argsu(ma, "cs_disk", args.cs_disk, 64);
ma = mount_argsu(ma, "cs_local", args.cs_local, 64);
ma = mount_argf(ma, "ssector", "%u", args.ssector);
OpenPOWER on IntegriCloud