Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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()

+1 -4
+1 -4
fs/super.c
··· 478 478 479 479 bool mount_capable(struct fs_context *fc) 480 480 { 481 - struct user_namespace *user_ns = fc->global ? &init_user_ns 482 - : fc->user_ns; 483 - 484 481 if (!(fc->fs_type->fs_flags & FS_USERNS_MOUNT)) 485 482 return capable(CAP_SYS_ADMIN); 486 483 else 487 - return ns_capable(user_ns, CAP_SYS_ADMIN); 484 + return ns_capable(fc->user_ns, CAP_SYS_ADMIN); 488 485 } 489 486 490 487 /**