| From: Carlos Maiolino <cem@kernel.org> |
| 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@kernel.org |
| Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> |
| Suggested-by: Aristeu Rozanski <aris@redhat.com> |
| Reviewed-by: Jan Kara <jack@suse.cz> |
| Cc: Christian Brauner <brauner@kernel.org> |
| Cc: Hugh Dickins <hughd@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| 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 */ |
| _ |
