From 4036cd070dc5c10e56ee81b7b59fac9c3d1b21b5 Mon Sep 17 00:00:00 2001 From: kib Date: Sun, 10 Oct 2010 07:05:47 +0000 Subject: The r184588 changed the layout of struct export_args, causing an ABI breakage for old mount(2) syscall, since most struct _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 --- sys/gnu/fs/reiserfs/reiserfs_mount.h | 2 +- sys/gnu/fs/reiserfs/reiserfs_vfsops.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/gnu/fs/reiserfs') diff --git a/sys/gnu/fs/reiserfs/reiserfs_mount.h b/sys/gnu/fs/reiserfs/reiserfs_mount.h index f47c976..fbb0b50 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_mount.h +++ b/sys/gnu/fs/reiserfs/reiserfs_mount.h @@ -39,7 +39,7 @@ struct reiserfs_mount { /* Arguments to mount ReiserFS filesystems. */ struct reiserfs_args { char *fspec; /* blocks special holding the fs to mount */ - struct export_args export; /* network export information */ + struct oexport_args export; /* network export information */ }; #endif /* !defined _GNU_REISERFS_REISERFS_MOUNT_H */ diff --git a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c index 6b4272e..1b5ce88 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c +++ b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c @@ -52,14 +52,16 @@ static int reiserfs_cmount(struct mntarg *ma, void *data, int flags) { struct reiserfs_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)); error = kernel_mount(ma, flags); -- cgit v1.1