summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-09-14 15:06:34 +0100
committerMark Brown <broonie@kernel.org>2026-09-14 15:06:34 +0100
commitf5d1f60a017a3a2985e0cff74fb52a63aa028d0b (patch)
treef8ce92326158d40e702ef7c308eb4ab9e9f11dc4 /mm
parent2d442d0a0bcdce69b1e9eb16c857378219ee7d64 (diff)
parent1002155c12fd3ffc775d43a9481e2986f77f1cad (diff)
downloadlinux-next-f5d1f60a017a3a2985e0cff74fb52a63aa028d0b.tar.gz
linux-next-f5d1f60a017a3a2985e0cff74fb52a63aa028d0b.zip
Merge branch 'fs-next' of linux-next
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem_quota.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/shmem_quota.c b/mm/shmem_quota.c
index d0b92d6da50f..a3fa4bd93e75 100644
--- a/mm/shmem_quota.c
+++ b/mm/shmem_quota.c
@@ -30,6 +30,7 @@
#include <linux/slab.h>
#include <linux/rbtree.h>
#include <linux/shmem_fs.h>
+#include <linux/magic.h>
#include <linux/quotaops.h>
#include <linux/quota.h>
@@ -54,6 +55,10 @@ struct quota_id {
static int shmem_check_quota_file(struct super_block *sb, int type)
{
+ /* Verify enabling happens on tmpfs superblock */
+ if (sb->s_magic != TMPFS_MAGIC)
+ return 0;
+
/* There is no real quota file, nothing to do */
return 1;
}