---

yaml --- r: 38749 b: refs/heads/master c: 597d0ca h: refs/heads/master i: 38747: 755dc5c v: v3
git-mirror · Jul 13, 2006 · b12d03c · b12d03c
1 parent 45c0c2f
commit b12d03c
Show file tree

Hide file tree

Showing 14 changed files with 1,193 additions and 1,261 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2eb168ca94aba3bcae350ad9b31870955174a218
+refs/heads/master: 597d0cae0f99f62501e229bed50e8149604015bb
diff --git a/trunk/fs/dlm/Kconfig b/trunk/fs/dlm/Kconfig
@@ -10,14 +10,6 @@ config DLM
 	A general purpose distributed lock manager for kernel or userspace
 	applications.
 
-config DLM_DEVICE
-	tristate "DLM device for userspace access"
-	depends on DLM
-	help
-	This module creates a misc device through which the dlm lockspace
-	and locking functions become available to userspace applications
-	(usually through the libdlm library).
-
 config DLM_DEBUG
 	bool "DLM debugging"
 	depends on DLM

diff --git a/trunk/fs/dlm/Makefile b/trunk/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 @@ dlm-y :=			ast.o \
 				recover.o \
 				recoverd.o \
 				requestqueue.o \
+				user.o \
 				util.o
 dlm-$(CONFIG_DLM_DEBUG) +=	debug_fs.o
 
-dlm_device-y :=			device.o
diff --git a/trunk/fs/dlm/ast.c b/trunk/fs/dlm/ast.c
@@ -13,7 +13,7 @@
 
 #include "dlm_internal.h"
 #include "lock.h"
-#include "ast.h"
+#include "user.h"
 
 #define WAKE_ASTS  0
 
@@ -34,6 +34,11 @@ void dlm_del_ast(struct dlm_lkb *lkb)
 
 void dlm_add_ast(struct dlm_lkb *lkb, int type)
 {
+	if (lkb->lkb_flags & DLM_IFL_USER) {
+		dlm_user_add_ast(lkb, type);
+		return;
+	}
+
 	spin_lock(&ast_queue_lock);
 	if (!(lkb->lkb_ast_type & (AST_COMP | AST_BAST))) {
 		kref_get(&lkb->lkb_ref);