The quilt patch titled
Subject: shmem_quota: build the object file conditionally to the config option
has been removed from the -mm tree. Its filename was
shmem_quota-build-the-object-file-conditionally-to-the-config-option.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: Carlos Maiolino <cem@xxxxxxxxxx>
Subject: shmem_quota: build the object file conditionally to the config option
Date: Wed, 17 Jul 2024 08:37:27 +0200
Initially I added shmem-quota to obj-y, move it to the correct place and
remove the unneeded full file #ifdef
Link: https://lkml.kernel.org/r/20240717063737.910840-1-cem@xxxxxxxxxx
Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Suggested-by: Aristeu Rozanski <aris@xxxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Cc: Christian Brauner <brauner@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/Makefile | 3 ++-
mm/shmem_quota.c | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
--- a/mm/Makefile~shmem_quota-build-the-object-file-conditionally-to-the-config-option
+++ a/mm/Makefile
@@ -53,7 +53,7 @@ obj-y := filemap.o mempool.o oom_kill.
readahead.o swap.o truncate.o vmscan.o shrinker.o \
shmem.o util.o mmzone.o vmstat.o backing-dev.o \
mm_init.o percpu.o slab_common.o \
- compaction.o show_mem.o shmem_quota.o\
+ compaction.o show_mem.o \
interval_tree.o list_lru.o workingset.o \
debug.o gup.o mmap_lock.o $(mmu-y)
@@ -141,3 +141,4 @@ obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) +=
obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o
obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
obj-$(CONFIG_EXECMEM) += execmem.o
+obj-$(CONFIG_TMPFS_QUOTA) += shmem_quota.o
--- a/mm/shmem_quota.c~shmem_quota-build-the-object-file-conditionally-to-the-config-option
+++ a/mm/shmem_quota.c
@@ -34,8 +34,6 @@
#include <linux/quotaops.h>
#include <linux/quota.h>
-#ifdef CONFIG_TMPFS_QUOTA
-
/*
* The following constants define the amount of time given a user
* before the soft limits are treated as hard limits (usually resulting
@@ -351,4 +349,3 @@ const struct dquot_operations shmem_quot
.mark_dirty = shmem_mark_dquot_dirty,
.get_next_id = shmem_get_next_id,
};
-#endif /* CONFIG_TMPFS_QUOTA */
_
Patches currently in -mm which might be from cem@xxxxxxxxxx are
