| Message ID | 20240717063737.910840-1-cem@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | shmem_quota: Build the object file conditionally to the config option | expand |
On Wed 17-07-24 08:37:27, cem@kernel.org wrote: > From: Carlos Maiolino <cem@kernel.org> > > Initially I added shmem-quota to obj-y, move it to the correct place and > remove the uneeded full file #ifdef > > Sugested-by: Aristeu Rozanski <aris@redhat.com> > Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> Sure. Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > mm/Makefile | 3 ++- > mm/shmem_quota.c | 3 --- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/mm/Makefile b/mm/Makefile > index 8fb85acda1b1c..c3cc1f51bc721 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ > 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) > > @@ -139,3 +139,4 @@ obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o > 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 > diff --git a/mm/shmem_quota.c b/mm/shmem_quota.c > index ce514e700d2f6..d1e32ac01407a 100644 > --- a/mm/shmem_quota.c > +++ b/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_quota_operations = { > .mark_dirty = shmem_mark_dquot_dirty, > .get_next_id = shmem_get_next_id, > }; > -#endif /* CONFIG_TMPFS_QUOTA */ > -- > 2.45.2 >
diff --git a/mm/Makefile b/mm/Makefile index 8fb85acda1b1c..c3cc1f51bc721 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -52,7 +52,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ 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) @@ -139,3 +139,4 @@ obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o 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 diff --git a/mm/shmem_quota.c b/mm/shmem_quota.c index ce514e700d2f6..d1e32ac01407a 100644 --- a/mm/shmem_quota.c +++ b/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_quota_operations = { .mark_dirty = shmem_mark_dquot_dirty, .get_next_id = shmem_get_next_id, }; -#endif /* CONFIG_TMPFS_QUOTA */