Deleted Added
full compact
vfs_mountroot.c (253847) vfs_mountroot.c (253910)
1/*-
2 * Copyright (c) 2010 Marcel Moolenaar
3 * Copyright (c) 1999-2004 Poul-Henning Kamp
4 * Copyright (c) 1999 Michael Smith
5 * Copyright (c) 1989, 1993
6 * The Regents of the University of California. All rights reserved.
7 * (c) UNIX System Laboratories, Inc.
8 * All or some portions of this file are derived from material licensed

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

33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 */
37
38#include "opt_rootdevname.h"
39
40#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2010 Marcel Moolenaar
3 * Copyright (c) 1999-2004 Poul-Henning Kamp
4 * Copyright (c) 1999 Michael Smith
5 * Copyright (c) 1989, 1993
6 * The Regents of the University of California. All rights reserved.
7 * (c) UNIX System Laboratories, Inc.
8 * All or some portions of this file are derived from material licensed

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

33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 */
37
38#include "opt_rootdevname.h"
39
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: head/sys/kern/vfs_mountroot.c 253847 2013-07-31 19:14:00Z ian $");
41__FBSDID("$FreeBSD: head/sys/kern/vfs_mountroot.c 253910 2013-08-03 04:25:25Z marcel $");
42
43#include <sys/param.h>
44#include <sys/conf.h>
45#include <sys/cons.h>
46#include <sys/fcntl.h>
47#include <sys/jail.h>
48#include <sys/kernel.h>
49#include <sys/malloc.h>

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

114
115static enum action root_mount_onfail = A_CONTINUE;
116
117static int root_mount_mddev;
118static int root_mount_complete;
119
120/* By default wait up to 3 seconds for devices to appear. */
121static int root_mount_timeout = 3;
42
43#include <sys/param.h>
44#include <sys/conf.h>
45#include <sys/cons.h>
46#include <sys/fcntl.h>
47#include <sys/jail.h>
48#include <sys/kernel.h>
49#include <sys/malloc.h>

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

114
115static enum action root_mount_onfail = A_CONTINUE;
116
117static int root_mount_mddev;
118static int root_mount_complete;
119
120/* By default wait up to 3 seconds for devices to appear. */
121static int root_mount_timeout = 3;
122TUNABLE_INT("vfs.mountroot.timeout", &root_mount_timeout);
122
123struct root_hold_token *
124root_mount_hold(const char *identifier)
125{
126 struct root_hold_token *h;
127
128 if (root_mounted())
129 return (NULL);

--- 911 unchanged lines hidden ---
123
124struct root_hold_token *
125root_mount_hold(const char *identifier)
126{
127 struct root_hold_token *h;
128
129 if (root_mounted())
130 return (NULL);

--- 911 unchanged lines hidden ---