Skip to content

Commit

Permalink
ocfs2: improve ocfs2 Makefile
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Larry Chen authored and Linus Torvalds committed Dec 28, 2018
1 parent dec5b0d commit 9e6aea2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fs/ocfs2/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
ccflags-y := -Ifs/ocfs2
ccflags-y := -I$(src)

obj-$(CONFIG_OCFS2_FS) += \
ocfs2.o \
Expand Down
2 changes: 1 addition & 1 deletion fs/ocfs2/dlm/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ccflags-y := -Ifs/ocfs2
ccflags-y := -I$(src)/..

obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o

Expand Down
2 changes: 1 addition & 1 deletion fs/ocfs2/dlmfs/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ccflags-y := -Ifs/ocfs2
ccflags-y := -I$(src)/..

obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o

Expand Down

0 comments on commit 9e6aea2

Please sign in to comment.