[GFS2] Fix bug in Makefiles for lock modules

The Makefile had the wrong CONFIG_ variable in it so that in
case GFS2 was y and the lock modules were m, they were not
getting built properly.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
index a9733ff80371939b8129f5b9e3a7749132da96ad..89b93b6b45cfad5af016e35609673b5d7f4f189f 100644 (file)
--- a/fs/gfs2/locking/dlm/Makefile
+++ b/fs/gfs2/locking/dlm/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_GFS2_FS) += lock_dlm.o
+obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o
 lock_dlm-y := lock.o main.o mount.o sysfs.o thread.o plock.o
 

diff --git a/fs/gfs2/locking/nolock/Makefile b/fs/gfs2/locking/nolock/Makefile
index cdadf956c83163e5e31532969b04d049d1b94f01..35e9730bc3a817165f4ae1410254768ba2882881 100644 (file)
--- a/fs/gfs2/locking/nolock/Makefile
+++ b/fs/gfs2/locking/nolock/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_GFS2_FS) += lock_nolock.o
+obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += lock_nolock.o
 lock_nolock-y := main.o