On 2025/5/15 00:50, Kemeng Shi wrote:
> We will miss shmem_unacct_size() when is_idmapped_mnt() returns a failure.
> Move is_idmapped_mnt() before shmem_acct_size() to fix the issue.
>
> Fixes: 7a80e5b8c6fa7 ("shmem: support idmapped mounts for tmpfs")
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
LGTM.
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
> ---
> mm/shmem.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 980fa15f393e..495e661eb8bb 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -5812,12 +5812,12 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name,
> if (size < 0 || size > MAX_LFS_FILESIZE)
> return ERR_PTR(-EINVAL);
>
> - if (shmem_acct_size(flags, size))
> - return ERR_PTR(-ENOMEM);
> -
> if (is_idmapped_mnt(mnt))
> return ERR_PTR(-EINVAL);
>
> + if (shmem_acct_size(flags, size))
> + return ERR_PTR(-ENOMEM);
> +
> inode = shmem_get_inode(&nop_mnt_idmap, mnt->mnt_sb, NULL,
> S_IFREG | S_IRWXUGO, 0, flags);
> if (IS_ERR(inode)) {