aboutsummaryrefslogtreecommitdiffstats
path: root/init/do_mounts.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/do_mounts.c')
-rw-r--r--init/do_mounts.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 02e3ca4fc527..52387f14f9b4 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -291,13 +291,13 @@ out:
291#ifdef CONFIG_ROOT_NFS 291#ifdef CONFIG_ROOT_NFS
292static int __init mount_nfs_root(void) 292static int __init mount_nfs_root(void)
293{ 293{
294 void *data = nfs_root_data(); 294 char *root_dev, *root_data;
295 295
296 create_dev("/dev/root", ROOT_DEV); 296 if (nfs_root_data(&root_dev, &root_data) != 0)
297 if (data && 297 return 0;
298 do_mount_root("/dev/root", "nfs", root_mountflags, data) == 0) 298 if (do_mount_root(root_dev, "nfs", root_mountflags, root_data) != 0)
299 return 1; 299 return 0;
300 return 0; 300 return 1;
301} 301}
302#endif 302#endif
303 303