Skip to content

Commit e3184de

Browse files
Kefeng Wangmcgrof
authored andcommitted
fs: fix sysctls.c built
'obj-$(CONFIG_SYSCTL) += sysctls.o' must be moved after "obj-y :=", or it won't be built as it is overwrited. Note that there is nothing that is going to break by linking sysctl.o later, we were just being way to cautious and patches have been updated to reflect these considerations and sent for stable as well with the whole "base" stuff needing to be linked prior to child sysctl tables that use that directory. All of the kernel sysctl APIs always share the same directory, and races against using it should end up re-using the same single created directory. And so something we can do eventually is do away with all the base stuff. For now it's fine, it's not creating an issue. It is just a bit pedantic and careful. Fixes: ab171b9 ("fs: move namespace sysctls and declare fs base directory") Cc: stable@vger.kernel.org # v5.17 Cc: Christian Brauner <brauner@kernel.org> Cc: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> [mcgrof: enhanced commit log for stable criteria and clarify base stuff ] Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
1 parent b3f312c commit e3184de

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

fs/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Rewritten to use lists instead of if-statements.
77
#
88

9-
obj-$(CONFIG_SYSCTL) += sysctls.o
109

1110
obj-y := open.o read_write.o file_table.o super.o \
1211
char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \
@@ -50,7 +49,7 @@ obj-$(CONFIG_FS_MBCACHE) += mbcache.o
5049
obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o
5150
obj-$(CONFIG_NFS_COMMON) += nfs_common/
5251
obj-$(CONFIG_COREDUMP) += coredump.o
53-
obj-$(CONFIG_SYSCTL) += drop_caches.o
52+
obj-$(CONFIG_SYSCTL) += drop_caches.o sysctls.o
5453

5554
obj-$(CONFIG_FHANDLE) += fhandle.o
5655
obj-y += iomap/

0 commit comments

Comments
 (0)