| ffs_vfsops.c (212788) | ffs_vfsops.c (213664) |
|---|---|
| 1/*- 2 * Copyright (c) 1989, 1991, 1993, 1994 3 * The Regents of the University of California. 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1989, 1991, 1993, 1994 3 * The Regents of the University of California. 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vfsops.c 212788 2010-09-17 09:14:40Z obrien $"); | 33__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_vfsops.c 213664 2010-10-10 07:05:47Z kib $"); |
| 34 35#include "opt_quota.h" 36#include "opt_ufs.h" 37#include "opt_ffs.h" 38#include "opt_ddb.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 416 unchanged lines hidden (view full) --- 458/* 459 * Compatibility with old mount system call. 460 */ 461 462static int 463ffs_cmount(struct mntarg *ma, void *data, int flags) 464{ 465 struct ufs_args args; | 34 35#include "opt_quota.h" 36#include "opt_ufs.h" 37#include "opt_ffs.h" 38#include "opt_ddb.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 416 unchanged lines hidden (view full) --- 458/* 459 * Compatibility with old mount system call. 460 */ 461 462static int 463ffs_cmount(struct mntarg *ma, void *data, int flags) 464{ 465 struct ufs_args args; |
| 466 struct export_args exp; |
|
| 466 int error; 467 468 if (data == NULL) 469 return (EINVAL); 470 error = copyin(data, &args, sizeof args); 471 if (error) 472 return (error); | 467 int error; 468 469 if (data == NULL) 470 return (EINVAL); 471 error = copyin(data, &args, sizeof args); 472 if (error) 473 return (error); |
| 474 vfs_oexport_conv(&args.export, &exp); |
|
| 473 474 ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); | 475 476 ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN); |
| 475 ma = mount_arg(ma, "export", &args.export, sizeof args.export); | 477 ma = mount_arg(ma, "export", &exp, sizeof(exp)); |
| 476 error = kernel_mount(ma, flags); 477 478 return (error); 479} 480 481/* 482 * Reload all incore data for a filesystem (used after running fsck on 483 * the root filesystem and finding things to fix). The filesystem must --- 1559 unchanged lines hidden --- | 478 error = kernel_mount(ma, flags); 479 480 return (error); 481} 482 483/* 484 * Reload all incore data for a filesystem (used after running fsck on 485 * the root filesystem and finding things to fix). The filesystem must --- 1559 unchanged lines hidden --- |