linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] nfs: Don't try mounting device as nfs root unless type fully matches
@ 2012-01-07  9:12 Sasha Levin
  2012-01-07 16:57 ` Chuck Lever
  0 siblings, 1 reply; 9+ messages in thread
From: Sasha Levin @ 2012-01-07  9:12 UTC (permalink / raw)
  To: chuck.lever, linux, Trond.Myklebust
  Cc: penberg, linux-nfs, linux-kernel, Sasha Levin

Currently, we'll try mounting any device who's major device number is
UNNAMED_MAJOR as NFS root. This would happen for non-NFS devices as well (such
as 9p devices) but it wouldn't cause any issues since mounting the device
as NFS would fail quickly and the code proceeded to doing the proper mount:

	[  101.522716] VFS: Unable to mount root fs via NFS, trying floppy.
	[  101.534499] VFS: Mounted root (9p filesystem) on device 0:18.

Commit 6829a048 ("NFS: Retry mounting NFSROOT") has introduced retries when
mounting NFS root, which means that now we don't immediately fail and instead
it takes an additional 90+ seconds until we stop retrying.

This meant that it would take an additional 90 seconds to boot when we're not
using a device type which gets detected in order before NFS.

This patch modifies the NFS type check to require device type to be
'Root_NFS' instead of requiring the device to have an UNNAMED_MAJOR major.
This makes boot process cleaner since we now won't go through the NFS mounting
code at all when the device isn't an NFS root ("/dev/nfs").

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
 init/do_mounts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 06225d2..da76f2c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -475,7 +475,7 @@ void __init change_floppy(char *fmt, ...)
 void __init mount_root(void)
 {
 #ifdef CONFIG_ROOT_NFS
-	if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) {
+	if (ROOT_DEV == Root_NFS) {
 		if (mount_nfs_root())
 			return;
 
-- 
1.7.8.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-03-31 21:25 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-07  9:12 [PATCH] nfs: Don't try mounting device as nfs root unless type fully matches Sasha Levin
2012-01-07 16:57 ` Chuck Lever
2012-01-07 18:12   ` Jim Rees
2012-01-09 12:14     ` Sasha Levin
2012-03-31 15:21       ` Sasha Levin
2012-03-31 15:27         ` Chuck Lever
2012-03-31 21:09           ` Myklebust, Trond
2012-03-31 21:21             ` Sasha Levin
2012-03-31 21:24               ` Myklebust, Trond

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).