summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/Makefile
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2008-05-23 14:46:04 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2008-06-27 09:39:28 +0100
commit048bca223739368aa5b9ce7cfb1d576c32d66cc7 (patch)
tree66d4f1c0e90eb6429755cb4529f8c7f609026e89 /fs/gfs2/Makefile
parentf3c9d38a26be32abf9b8897e9e0afc7166c712dd (diff)
downloadlinux-stable-048bca223739368aa5b9ce7cfb1d576c32d66cc7.tar.gz
linux-stable-048bca223739368aa5b9ce7cfb1d576c32d66cc7.tar.bz2
linux-stable-048bca223739368aa5b9ce7cfb1d576c32d66cc7.zip
[GFS2] No lock_nolock
This patch merges the lock_nolock module into GFS2 itself. As well as removing some of the overhead of the module, it also means that its now impossible to build GFS2 without a lock module (which would be a pointless thing to do anyway). We also plan to merge lock_dlm into GFS2 in the future, but that is a more tricky task, and will therefore be a separate patch. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Cc: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/gfs2/Makefile')
-rw-r--r--fs/gfs2/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/Makefile b/fs/gfs2/Makefile
index e2350df02a07..ec65851ec80a 100644
--- a/fs/gfs2/Makefile
+++ b/fs/gfs2/Makefile
@@ -5,6 +5,5 @@ gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \
ops_fstype.o ops_inode.o ops_super.o quota.o \
recovery.o rgrp.o super.o sys.o trans.o util.o
-obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/
obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/