[Devel] [PATCH RHEL9 COMMIT] ms/fs: fix sysctls.c built

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-425.vz9.60.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-425.vz9.60.5
------>
commit c659858040f3a849854af4debf57fffea32bfea8
Author: Kefeng Wang <wangkefeng.wang at huawei.com>
Date:   Fri Mar 31 16:45:02 2023 +0800

    ms/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.
    
    mFixes: ab171b952c6e ("fs: move namespace sysctls and declare fs base directory")
    Cc: stable at vger.kernel.org # v5.17
    Cc: Christian Brauner <brauner at kernel.org>
    Cc: Kefeng Wang <wangkefeng.wang at huawei.com>
    Signed-off-by: Kefeng Wang <wangkefeng.wang at huawei.com>
    [mcgrof: enhanced commit log for stable criteria and clarify base stuff ]
    Signed-off-by: Luis Chamberlain <mcgrof at kernel.org>
    
    In our case we have noticed missing "odirect_enable" file in the
    /proc/sys/fs directory.
    
    https://virtuozzo.atlassian.net/browse/PSBM-156472
    
    (cherry picked from commit e3184de9d46c2eebdb776face2e2662c6733331d)
    Signed-off-by: Alexander Atanasov <alexander.atanasov at virtuozzo.com>
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    
    Feature: fix ms/fs
---
 fs/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/Makefile b/fs/Makefile
index 76f188548acb..86686a9c7477 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -6,7 +6,6 @@
 # Rewritten to use lists instead of if-statements.
 # 
 
-obj-$(CONFIG_SYSCTL)		+= sysctls.o
 
 obj-y :=	open.o read_write.o file_table.o super.o \
 		char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \
@@ -44,7 +43,7 @@ obj-$(CONFIG_FS_MBCACHE)	+= mbcache.o
 obj-$(CONFIG_FS_POSIX_ACL)	+= posix_acl.o
 obj-$(CONFIG_NFS_COMMON)	+= nfs_common/
 obj-$(CONFIG_COREDUMP)		+= coredump.o
-obj-$(CONFIG_SYSCTL)		+= drop_caches.o
+obj-$(CONFIG_SYSCTL)		+= drop_caches.o sysctls.o
 
 obj-$(CONFIG_FHANDLE)		+= fhandle.o
 obj-y				+= iomap/