ocfs2: make local header paths relative to C files
PATCH 1/1 ocfs2: make local header paths relative to C files
From: Masahiro Yamada <[email protected]>
Gang He reports the failure of building fs/ocfs2/ as an external module of the kernel installed on the system:
$ cd fs/ocfs2 $ make -C /lib/modules/`uname -r`/build M=`pwd` modules
If you want to make it work reliably, I'd recommend to remove ccflags-y from the Makefiles, and to make header paths relative to the C files. I think this is the correct usage of the #include "..." directive.
--- fs/ocfs2/dlm/Makefile | 2 -- fs/ocfs2/dlm/dlmast.c | 8 ++++---- fs/ocfs2/dlm/dlmconvert.c | 8 ++++---- fs/ocfs2/dlm/dlmdebug.c | 8 ++++---- fs/ocfs2/dlm/dlmdomain.c | 8 ++++---- fs/ocfs2/dlm/dlmlock.c | 8 ++++---- fs/ocfs2/dlm/dlmmaster.c | 8 ++++---- fs/ocfs2/dlm/dlmrecovery.c | 8 ++++---- fs/ocfs2/dlm/dlmthread.c | 8 ++++---- fs/ocfs2/dlm/dlmunlock.c | 8 ++++---- fs/ocfs2/dlmfs/Makefile | 2 -- fs/ocfs2/dlmfs/dlmfs.c | 4 ++-- fs/ocfs2/dlmfs/userdlm.c | 6 +++--- 13 files changed, 41 insertions(+), 45 deletions(-)
fs/ocfs2/dlm/Makefile +0 -2
@@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y := -I $(srctree)/$(src)/.. - obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \
fs/ocfs2/dlm/dlmast.c +4 -4
@@ -23,15 +23,15 @@#include <linux/spinlock.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h" #define MLOG_MASK_PREFIX ML_DLM -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static void dlm_update_lvb (struct dlm_ctxt *dlm,struct dlm_lock_resource *res,struct dlm_lock *lock);
fs/ocfs2/dlm/dlmconvert.c +4 -4
@@ -23,9 +23,9 @@#include <linux/spinlock.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h"
@@ -33,7 +33,7 @@#include "dlmconvert.h" #define MLOG_MASK_PREFIX ML_DLM -#include "cluster/masklog.h" +#include "../cluster/masklog.h" /* NOTE: __dlmconvert_master is the only function in here that * needs a spinlock held on entry (res->spinlock) and it is the
fs/ocfs2/dlm/dlmdebug.c +4 -4
@@ -17,9 +17,9 @@#include <linux/debugfs.h> #include <linux/export.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h"
@@ -27,7 +27,7 @@#include "dlmdebug.h" #define MLOG_MASK_PREFIX ML_DLM -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static int stringify_lockname (const char *lockname,int locklen,char *buf,int len);
fs/ocfs2/dlm/dlmdomain.c +4 -4
@@ -20,9 +20,9 @@#include <linux/debugfs.h> #include <linux/sched/signal.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h"
@@ -30,7 +30,7 @@#include "dlmdebug.h" #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_DOMAIN) -#include "cluster/masklog.h" +#include "../cluster/masklog.h" /* * ocfs2 node maps are array of long int, which limits to send them freely
fs/ocfs2/dlm/dlmlock.c +4 -4
@@ -25,9 +25,9 @@#include <linux/delay.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h"
@@ -35,7 +35,7 @@#include "dlmconvert.h" #define MLOG_MASK_PREFIX ML_DLM -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static struct kmem_cache *dlm_lock_cache;
fs/ocfs2/dlm/dlmmaster.c +4 -4
@@ -25,9 +25,9 @@#include <linux/delay.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h"
@@ -35,7 +35,7 @@#include "dlmdebug.h" #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER) -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static void dlm_mle_node_down(struct dlm_ctxt *dlm, struct dlm_master_list_entry *mle,
fs/ocfs2/dlm/dlmrecovery.c +4 -4
@@ -26,16 +26,16 @@#include <linux/delay.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h" #include "dlmdomain.h" #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_RECOVERY) -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static void dlm_do_local_recovery_cleanup (struct dlm_ctxt *dlm,u8 dead_node);
fs/ocfs2/dlm/dlmthread.c +4 -4
@@ -25,16 +25,16 @@#include <linux/delay.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h" #include "dlmdomain.h" #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_THREAD) -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static int dlm_thread (void *data);static void dlm_flush_asts (struct dlm_ctxt *dlm);
fs/ocfs2/dlm/dlmunlock.c +4 -4
@@ -23,15 +23,15 @@#include <linux/spinlock.h> #include <linux/delay.h> -#include "cluster/heartbeat.h" -#include "cluster/nodemanager.h" -#include "cluster/tcp.h" +#include "../cluster/heartbeat.h" +#include "../cluster/nodemanager.h" +#include "../cluster/tcp.h" #include "dlmapi.h" #include "dlmcommon.h" #define MLOG_MASK_PREFIX ML_DLM -#include "cluster/masklog.h" +#include "../cluster/masklog.h" #define DLM_UNLOCK_FREE_LOCK 0x00000001#define DLM_UNLOCK_CALL_AST 0x00000002
fs/ocfs2/dlmfs/Makefile +0 -2
@@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -ccflags-y := -I $(srctree)/$(src)/.. - obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o ocfs2_dlmfs-objs := userdlm.o dlmfs.o
fs/ocfs2/dlmfs/dlmfs.c +2 -2
@@ -33,11 +33,11 @@#include <linux/uaccess.h> -#include "stackglue.h" +#include "../stackglue.h" #include "userdlm.h" #define MLOG_MASK_PREFIX ML_DLMFS -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static const struct super_operations dlmfs_ops;
fs/ocfs2/dlmfs/userdlm.c +3 -3
@@ -21,12 +21,12 @@#include <linux/types.h> #include <linux/crc32.h> -#include "ocfs2_lockingver.h" -#include "stackglue.h" +#include "../ocfs2_lockingver.h" +#include "../stackglue.h" #include "userdlm.h" #define MLOG_MASK_PREFIX ML_DLMFS -#include "cluster/masklog.h" +#include "../cluster/masklog.h" static inline struct user_lock_res *user_lksb_to_lock_res (struct ocfs2_dlm_lksb *lksb)
Signature · 1 line
2.17.1
Quoted 8 lines · On Fri, 27 Dec 2019 02:30:15 +0000 Gang He <[email protected]> wrote:
From: Masahiro Yamada <[email protected]>
Gang He reports the failure of building
fs/ocfs2/as an external module of the kernel installed on the system:$ cd fs/ocfs2 $ make -C /lib/modules/`uname -r`/build M=`pwd` modules
Quoted 7 lines
If you want to make it work reliably, I'd recommend to remove ccflags-y from the Makefiles, and to make header paths relative to the C files. I think this is the correct usage of the #include "..." directive.
Reported-by Gang He <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Gang He <[email protected]>
Your signed-off-by should appear here, since you were on the patch delivery path. I have made that change, OK?
PATCH 1/1 ocfs2: make local header paths relative to C files
________________________________
From: Andrew Morton <[email protected]>
Sent: Wednesday, January 1, 2020 6:33 AM
To: Gang He <[email protected]>
Cc: mark at fasheh.com <[email protected]>; jlbec at evilplan.org <[email protected]>; joseph.qi at linux.alibaba.com <[email protected]>; Masahiro Yamada <[email protected]>; linux-kernel at vger.kernel.org <[email protected]>; ocfs2-devel at oss.oracle.com <[email protected]>
Subject: Re: [PATCH] ocfs2: make local header paths relative to C files
Quoted 8 lines · On Fri, 27 Dec 2019 02:30:15 +0000 Gang He <[email protected]> wrote:
From: Masahiro Yamada <[email protected]>
Gang He reports the failure of building
fs/ocfs2/as an external module of the kernel installed on the system:$ cd fs/ocfs2 $ make -C /lib/modules/`uname -r`/build M=`pwd` modules
Quoted 7 lines
If you want to make it work reliably, I'd recommend to remove ccflags-y from the Makefiles, and to make header paths relative to the C files. I think this is the correct usage of the #include "..." directive.
Reported-by Gang He <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Gang He <[email protected]>
Your signed-off-by should appear here, since you were on the patch
delivery path. I have made that change, OK?
Sure, thank you, Andrew.
Originally, I just wanted to help Masahiro to send this patch in text mode, instead of attachment.
Thanks
Gang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20200101/2e0d5908/attachment-0001.html