The patch titled userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix has been removed from the -mm tree. Its filename was userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix.patch This patch was dropped because it was folded into userns-rename-is_owner_or_cap-to-inode_owner_or_capable.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> btrfs changed in linux-next Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx> Cc: Daniel Lezcano <daniel.lezcano@xxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: James Morris <jmorris@xxxxxxxxx> Cc: Serge E. Hallyn <serge.hallyn@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/btrfs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/btrfs/ioctl.c~userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix fs/btrfs/ioctl.c --- a/fs/btrfs/ioctl.c~userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix +++ a/fs/btrfs/ioctl.c @@ -1077,7 +1077,7 @@ static noinline int btrfs_ioctl_subvol_s if (flags & ~BTRFS_SUBVOL_RDONLY) return -EOPNOTSUPP; - if (!is_owner_or_cap(inode)) + if (!inode_owner_or_capable(inode)) return -EACCES; down_write(&root->fs_info->subvol_sem); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch fs-adfs-adfsh-fix-unsigned-comparison.patch memcg-use-native-word-page-statistics-counters.patch mm-memcontrolc-suppress-uninitializer-var-warning-with-older-gccs.patch cpuset-fix-unchecked-calls-to-nodemask_alloc.patch userns-security-make-capabilities-relative-to-the-user-namespace.patch userns-user-namespaces-convert-several-capable-calls.patch userns-userns-check-user-namespace-for-task-file-uid-equivalence-checks.patch userns-rename-is_owner_or_cap-to-inode_owner_or_capable.patch userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix-fix.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix-fix.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix-fix-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html