Re: [PATCH 33/34] overlayfs: handle idmapped merged mounts

-int ovl_permission(struct inode *inode, int mask) +int ovl_permission_mapped(struct user_namespace *user_ns, + struct inode *inode, int mask) { struct inode *upperinode = ovl_inode_upper(inode); struct inode *realinode = upperinode ?: ovl_inode_lower(inode); - struct user_namespace *user_ns; + struct user_namespace *real_user_ns; const struct cred *old_cred; int err; @@ -302,15 +313,15 @@ int ovl_permission(struct inode *inode, int mask) } if (upperinode) - user_ns = ovl_upper_mnt_user_ns(OVL_FS(inode->i_sb)); + real_user_ns = ovl_upper_mnt_user_ns(OVL_FS(inode->i_sb)); else - user_ns = OVL_I(inode)->lower_user_ns; + real_user_ns = OVL_I(inode)->lower_user_ns;