---

yaml
---
r: 185452
b: refs/heads/master
c: 34a9dd7
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65b6f3403431cd43ef7b0dab679a50f770124a65
+refs/heads/master: 34a9dd7e29e9129fec40c645a03f1bbbe810e771

trunk/fs/ocfs2/Makefile

@@ -46,6 +46,7 @@ ocfs2_stackglue-objs := stackglue.o
 ocfs2_stack_o2cb-objs := stack_o2cb.o
 ocfs2_stack_user-objs := stack_user.o
 
+obj-$(CONFIG_OCFS2_FS) += dlmfs/
 # cluster/ is always needed when OCFS2_FS for masklog support
 obj-$(CONFIG_OCFS2_FS) += cluster/
 obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/

trunk/fs/ocfs2/dlm/Makefile

@@ -1,8 +1,7 @@
 EXTRA_CFLAGS += -Ifs/ocfs2
 
-obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o ocfs2_dlmfs.o
+obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o
 
 ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \
 	dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o
 
-ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o

trunk/fs/ocfs2/dlmfs/Makefile

@@ -0,0 +1,5 @@
+EXTRA_CFLAGS += -Ifs/ocfs2
+
+obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o
+
+ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o

trunk/fs/ocfs2/dlm/dlmfs.c → trunk/fs/ocfs2/dlmfs/dlmfs.c

@@ -52,7 +52,7 @@
 #include "cluster/heartbeat.h"
 #include "cluster/tcp.h"
 
-#include "dlmapi.h"
+#include "dlm/dlmapi.h"
 
 #include "userdlm.h"
 

trunk/fs/ocfs2/dlm/userdlm.c → trunk/fs/ocfs2/dlmfs/userdlm.c

@@ -39,7 +39,7 @@
 #include "cluster/heartbeat.h"
 #include "cluster/tcp.h"
 
-#include "dlmapi.h"
+#include "dlm/dlmapi.h"
 
 #include "userdlm.h"