Unverified Commit 1e5f0fb4 authored by Askar Safin's avatar Askar Safin Committed by Christian Brauner
Browse files

vfs: fs/namespace.c: remove ms_flags argument from do_remount

parent 573015df
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -3279,7 +3279,7 @@ static int do_reconfigure_mnt(struct path *path, unsigned int mnt_flags)
 * If you've mounted a non-root directory somewhere and want to do remount
 * on it - tough luck.
 */
static int do_remount(struct path *path, int ms_flags, int sb_flags,
static int do_remount(struct path *path, int sb_flags,
		      int mnt_flags, void *data)
{
	int err;
@@ -4111,7 +4111,7 @@ int path_mount(const char *dev_name, struct path *path,
	if ((flags & (MS_REMOUNT | MS_BIND)) == (MS_REMOUNT | MS_BIND))
		return do_reconfigure_mnt(path, mnt_flags);
	if (flags & MS_REMOUNT)
		return do_remount(path, flags, sb_flags, mnt_flags, data_page);
		return do_remount(path, sb_flags, mnt_flags, data_page);
	if (flags & MS_BIND)
		return do_loopback(path, dev_name, flags & MS_REC);
	if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))