Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (73d080d3) · Commits · 戴 / test

fs/namespace.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2826,6 +2826,7 @@ long do_mount(const char dev_name, const char __user dir_name,
		SB_DIRSYNC \|
		SB_SILENT \|
		SB_POSIXACL \|
		SB_LAZYTIME \|
		SB_I_VERSION);

		if (flags & MS_REMOUNT)

fs/super.c

+18 −19

Original line number	Diff line number	Diff line
		@@ -191,6 +191,24 @@ static struct super_block alloc_super(struct file_system_type type, int flags,

		INIT_LIST_HEAD(&s->s_mounts);
		s->s_user_ns = get_user_ns(user_ns);
		init_rwsem(&s->s_umount);
		lockdep_set_class(&s->s_umount, &type->s_umount_key);
		/*
		* sget() can have s_umount recursion.
		*
		* When it cannot find a suitable sb, it allocates a new
		* one (this one), and tries again to find a suitable old
		* one.
		*
		* In case that succeeds, it will acquire the s_umount
		* lock of the old one. Since these are clearly distrinct
		* locks, and this object isn't exposed yet, there's no
		* risk of deadlocks.
		*
		* Annotate this by putting this lock in a different
		* subclass.
		*/
		down_write_nested(&s->s_umount, SINGLE_DEPTH_NESTING);

		if (security_sb_alloc(s))
		goto fail;
		@@ -218,25 +236,6 @@ static struct super_block alloc_super(struct file_system_type type, int flags,
		goto fail;
		if (list_lru_init_memcg(&s->s_inode_lru))
		goto fail;

		init_rwsem(&s->s_umount);
		lockdep_set_class(&s->s_umount, &type->s_umount_key);
		/*
		* sget() can have s_umount recursion.
		*
		* When it cannot find a suitable sb, it allocates a new
		* one (this one), and tries again to find a suitable old
		* one.
		*
		* In case that succeeds, it will acquire the s_umount
		* lock of the old one. Since these are clearly distrinct
		* locks, and this object isn't exposed yet, there's no
		* risk of deadlocks.
		*
		* Annotate this by putting this lock in a different
		* subclass.
		*/
		down_write_nested(&s->s_umount, SINGLE_DEPTH_NESTING);
		s->s_count = 1;
		atomic_set(&s->s_active, 1);
		mutex_init(&s->s_vfs_rename_mutex);

Admin message