[DLM] dlm: user locks
This changes the way the dlm handles user locks. The core dlm is now
aware of user locks so they can be dealt with more efficiently. There is
no more dlm_device module which previously managed its own duplicate copy
of every user lock.
Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/dlm/Makefile b/fs/dlm/Makefile
index 1e6232e..1832e02 100644
--- a/fs/dlm/Makefile
+++ b/fs/dlm/Makefile
@@ -1,6 +1,4 @@
obj-$(CONFIG_DLM) += dlm.o
-obj-$(CONFIG_DLM_DEVICE) += dlm_device.o
-
dlm-y := ast.o \
config.o \
dir.o \
@@ -15,7 +13,7 @@
recover.o \
recoverd.o \
requestqueue.o \
+ user.o \
util.o
dlm-$(CONFIG_DLM_DEBUG) += debug_fs.o
-dlm_device-y := device.o