066206bc6e
[ Upstream commit 9e6aea22802b5684c7e1d69822aeb0844dd01953 ] Included file path was hard-wired in the ocfs2 makefile, which might causes some confusion when compiling ocfs2 as an external module. Say if we compile ocfs2 module as following. cp -r /kernel/tree/fs/ocfs2 /other/dir/ocfs2 cd /other/dir/ocfs2 make -C /path/to/kernel_source M=`pwd` modules Acutally, the compiler wil try to find included file in /kernel/tree/fs/ocfs2, rather than the directory /other/dir/ocfs2. To fix this little bug, we introduce the var $(src) provided by kbuild. $(src) means the absolute path of the running kbuild file. Link: http://lkml.kernel.org/r/20181108085546.15149-1-lchen@suse.com Signed-off-by: Larry Chen <lchen@suse.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> 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 <ge.changwei@h3c.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
53 lines
1 KiB
Makefile
53 lines
1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
ccflags-y := -I$(src)
|
|
|
|
obj-$(CONFIG_OCFS2_FS) += \
|
|
ocfs2.o \
|
|
ocfs2_stackglue.o
|
|
|
|
obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_stack_o2cb.o
|
|
obj-$(CONFIG_OCFS2_FS_USERSPACE_CLUSTER) += ocfs2_stack_user.o
|
|
|
|
ocfs2-objs := \
|
|
alloc.o \
|
|
aops.o \
|
|
blockcheck.o \
|
|
buffer_head_io.o \
|
|
dcache.o \
|
|
dir.o \
|
|
dlmglue.o \
|
|
export.o \
|
|
extent_map.o \
|
|
file.o \
|
|
heartbeat.o \
|
|
inode.o \
|
|
ioctl.o \
|
|
journal.o \
|
|
localalloc.o \
|
|
locks.o \
|
|
mmap.o \
|
|
namei.o \
|
|
refcounttree.o \
|
|
reservations.o \
|
|
move_extents.o \
|
|
resize.o \
|
|
slot_map.o \
|
|
suballoc.o \
|
|
super.o \
|
|
symlink.o \
|
|
sysfile.o \
|
|
uptodate.o \
|
|
quota_local.o \
|
|
quota_global.o \
|
|
xattr.o \
|
|
acl.o \
|
|
filecheck.o
|
|
|
|
ocfs2_stackglue-objs := stackglue.o
|
|
ocfs2_stack_o2cb-objs := stack_o2cb.o
|
|
ocfs2_stack_user-objs := stack_user.o
|
|
|
|
obj-$(CONFIG_OCFS2_FS) += dlmfs/
|
|
# cluster/ is always needed when OCFS2_FS for masklog support
|
|
obj-$(CONFIG_OCFS2_FS) += cluster/
|
|
obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/
|