Commit ca322fb6 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

ocfs2: make local header paths relative to C files 

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.

Link: http://lkml.kernel.org/r/20191227022950.14804-1-ghe@suse.com


Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarGang He <ghe@suse.com>
Reported-by: default avatarGang He <ghe@suse.com>
Reviewed-by: default avatarGang He <ghe@suse.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b43d645

fs/ocfs2/dlm/Makefile

+0 −2
Original line number Diff line number Diff line 
# 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE