Merge "Fix root mounting with no mount options"

static int __init do_mount_root(char *name, char *fs, int flags, void *data)

{

	struct super_block *s;

	int err = ksys_mount(name, "/root", fs, flags, data);

	if (err)

		return err;

	char *data_page = NULL;

	struct page *p = NULL;

	int ret;

	if (data) {

		/* do_mount() requires a full page as fifth argument */

		p = alloc_page(GFP_KERNEL);

		if (!p)

			return -ENOMEM;

		data_page = page_address(p);

		/* zero-pad. do_mount() will make sure it's terminated */

		strscpy(data_page, data, PAGE_SIZE);

	}

	ret = ksys_mount(name, "/root", fs, flags, data_page);

	if (ret)

		goto out;

	ksys_chdir("/root");

	s = current->fs->pwd.dentry->d_sb;

	       s->s_type->name,

	       sb_rdonly(s) ? " readonly" : "",

	       MAJOR(ROOT_DEV), MINOR(ROOT_DEV));

	return 0;

out:

	if (p)

		put_page(p);

	return ret;

}

void __init mount_block_root(char *name, int flags)