Commit 5c620753 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull mount_capable() fix from Al Viro.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Unbreak mount_capable()
parents b36a1552 c2c44ec2

fs/super.c

+1 −4
Original line number Diff line number Diff line
@@ -478,13 +478,10 @@ EXPORT_SYMBOL(generic_shutdown_super); 


bool mount_capable(struct fs_context *fc)

{

	struct user_namespace *user_ns = fc->global ? &init_user_ns

						    : fc->user_ns;



	if (!(fc->fs_type->fs_flags & FS_USERNS_MOUNT))

		return capable(CAP_SYS_ADMIN);

	else

		return ns_capable(user_ns, CAP_SYS_ADMIN);

		return ns_capable(fc->user_ns, CAP_SYS_ADMIN);

}



/**