fs: port i_{g,u}id_into_vfs{g,u}id() to mnt_idmap

[linux-2.6-block.git] / fs / coredump.c

diff --git a/fs/coredump.c b/fs/coredump.c
index 27847d16d2b8941fb44626a9b080bae172e7bc8b..b31ea0f87ccbaeac89d964294561bfc75ed25f76 100644 (file)
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -645,7 +645,6 @@ void do_coredump(const kernel_siginfo_t *siginfo)
                }
        } else {
                struct mnt_idmap *idmap;
-               struct user_namespace *mnt_userns;
                struct inode *inode;
                int open_flags = O_CREAT | O_RDWR | O_NOFOLLOW |
                                 O_LARGEFILE | O_EXCL;
@@ -724,8 +723,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
                 * filesystem.
                 */
                idmap = file_mnt_idmap(cprm.file);
-               mnt_userns = mnt_idmap_owner(idmap);
-               if (!vfsuid_eq_kuid(i_uid_into_vfsuid(mnt_userns, inode),
+               if (!vfsuid_eq_kuid(i_uid_into_vfsuid(idmap, inode),
                                    current_fsuid())) {
                        pr_info_ratelimited("Core dump to %s aborted: cannot preserve file owner\n",
                                            cn.corename);