* [merged mm-stable] shmem-properly-report-quota-mount-options.patch removed from -mm tree
@ 2024-02-24 1:50 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2024-02-24 1:50 UTC (permalink / raw)
To: mm-commits, hughd, cmaiolino, jack, akpm
The quilt patch titled
Subject: shmem: properly report quota mount options
has been removed from the -mm tree. Its filename was
shmem-properly-report-quota-mount-options.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Jan Kara <jack@suse.cz>
Subject: shmem: properly report quota mount options
Date: Mon, 29 Jan 2024 13:01:31 +0100
Report quota options among the set of mount options. This allows proper
user visibility into whether quotas are enabled or not.
Link: https://lkml.kernel.org/r/20240129120131.21145-1-jack@suse.cz
Fixes: e09764cff44b ("shmem: quota support")
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/shmem.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
--- a/mm/shmem.c~shmem-properly-report-quota-mount-options
+++ a/mm/shmem.c
@@ -4265,6 +4265,24 @@ static int shmem_show_options(struct seq
mpol_put(mpol);
if (sbinfo->noswap)
seq_printf(seq, ",noswap");
+#ifdef CONFIG_TMPFS_QUOTA
+ if (sb_has_quota_active(root->d_sb, USRQUOTA))
+ seq_printf(seq, ",usrquota");
+ if (sb_has_quota_active(root->d_sb, GRPQUOTA))
+ seq_printf(seq, ",grpquota");
+ if (sbinfo->qlimits.usrquota_bhardlimit)
+ seq_printf(seq, ",usrquota_block_hardlimit=%lld",
+ sbinfo->qlimits.usrquota_bhardlimit);
+ if (sbinfo->qlimits.grpquota_bhardlimit)
+ seq_printf(seq, ",grpquota_block_hardlimit=%lld",
+ sbinfo->qlimits.grpquota_bhardlimit);
+ if (sbinfo->qlimits.usrquota_ihardlimit)
+ seq_printf(seq, ",usrquota_inode_hardlimit=%lld",
+ sbinfo->qlimits.usrquota_ihardlimit);
+ if (sbinfo->qlimits.grpquota_ihardlimit)
+ seq_printf(seq, ",grpquota_inode_hardlimit=%lld",
+ sbinfo->qlimits.grpquota_ihardlimit);
+#endif
return 0;
}
_
Patches currently in -mm which might be from jack@suse.cz are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-02-24 1:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-24 1:50 [merged mm-stable] shmem-properly-report-quota-mount-options.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.