Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (4dbb29fe) · Commits · 戴 / test

Pull vfs fixes from Al Viro: "A couple of trivial patches that fell through the cracks last cycle" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: fix indentation in deactivate_super() vfs: Remove duplicated d_mountpoint check in __is_local_mountpoint

fs/namespace.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -684,9 +684,6 @@ bool __is_local_mountpoint(struct dentry *dentry)
		struct mount *mnt;
		bool is_covered = false;

		if (!d_mountpoint(dentry))
		goto out;

		down_read(&namespace_sem);
		lock_ns_list(ns);
		list_for_each_entry(mnt, &ns->list, mnt_list) {
		@@ -698,7 +695,7 @@ bool __is_local_mountpoint(struct dentry *dentry)
		}
		unlock_ns_list(ns);
		up_read(&namespace_sem);
		out:

		return is_covered;
		}

fs/super.c

+1 −1

File changed.

Contains only whitespace changes.

Admin message