| Message ID | 20210206000609.xM6fuPWxb%akpm@linux-foundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | [alternative-merged] tmpfs-dont-use-64-bit-inodes-by-defulat-with-32-bit-ino_t.patch removed from -mm tree | expand |
--- a/mm/shmem.c~tmpfs-dont-use-64-bit-inodes-by-defulat-with-32-bit-ino_t +++ a/mm/shmem.c @@ -3733,7 +3733,7 @@ static int shmem_fill_super(struct super ctx->blocks = shmem_default_max_blocks(); if (!(ctx->seen & SHMEM_SEEN_INODES)) ctx->inodes = shmem_default_max_inodes(); - if (!(ctx->seen & SHMEM_SEEN_INUMS)) + if (!(ctx->seen & SHMEM_SEEN_INUMS) && sizeof(ino_t) >= 8) ctx->full_inums = IS_ENABLED(CONFIG_TMPFS_INODE64); } else { sb->s_flags |= SB_NOUSER;
The patch titled Subject: tmpfs: don't use 64-bit inodes by defulat with 32-bit ino_t has been removed from the -mm tree. Its filename was tmpfs-dont-use-64-bit-inodes-by-defulat-with-32-bit-ino_t.patch This patch was dropped because an alternative patch was merged ------------------------------------------------------ From: Seth Forshee <seth.forshee@canonical.com> Subject: tmpfs: don't use 64-bit inodes by defulat with 32-bit ino_t Currently there seems to be an assumption in tmpfs that 64-bit architectures also have a 64-bit ino_t. This is not true; s390 at least has a 32-bit ino_t. With CONFIG_TMPFS_INODE64=y tmpfs mounts will get 64-bit inode numbers and display "inode64" in the mount options, but passing the "inode64" mount option will fail. This leads to the following behavior: # mkdir mnt # mount -t tmpfs nodev mnt # mount -o remount,rw mnt mount: /home/ubuntu/mnt: mount point not mounted or bad option. As mount sees "inode64" in the mount options and thus passes it in the options for the remount. Ideally CONFIG_TMPFS_INODE64 would depend on sizeof(ino_t) < 8, but I don't think it's possible to test for this (potentially CONFIG_ARCH_HAS_64BIT_INO_T or similar could be added, but I'm not sure whether or not that is wanted). So fix this by simply refusing to honor the CONFIG_TMPFS_INODE64 setting when sizeof(ino_t) < 8. Link: https://lkml.kernel.org/r/20210205202159.505612-1-seth.forshee@canonical.com Fixes: ea3271f7196c ("tmpfs: support 64-bit inums per-sb") Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Cc: Chris Down <chris@chrisdown.name> Cc: Hugh Dickins <hughd@google.com> Cc: Amir Goldstein <amir73il@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)