Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34a9dd7e authored by Joel Becker's avatar Joel Becker
Browse files

ocfs2_dlmfs: Move to its own directory 



We're going to remove the tie between ocfs2_dlmfs and o2dlm.
ocfs2_dlmfs doesn't belong in the fs/ocfs2/dlm directory anymore.  Here
we move it to fs/ocfs2/dlmfs.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 65b6f340

fs/ocfs2/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ ocfs2_stackglue-objs := stackglue.o 
ocfs2_stack_o2cb-objs := stack_o2cb.o

ocfs2_stack_o2cb-objs := stack_o2cb.o

ocfs2_stack_user-objs := stack_user.o

ocfs2_stack_user-objs := stack_user.o





obj-$(CONFIG_OCFS2_FS) += dlmfs/

# cluster/ is always needed when OCFS2_FS for masklog support

# cluster/ is always needed when OCFS2_FS for masklog support

obj-$(CONFIG_OCFS2_FS) += cluster/

obj-$(CONFIG_OCFS2_FS) += cluster/

obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/
 
obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/

fs/ocfs2/dlm/Makefile

+1 −2
Original line number Original line Diff line number Diff line 
EXTRA_CFLAGS += -Ifs/ocfs2

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 \

ocfs2_dlm-objs := dlmdomain.o dlmdebug.o dlmthread.o dlmrecovery.o \

	dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o

	dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o dlmver.o

ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o

fs/ocfs2/dlmfs/Makefile

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
EXTRA_CFLAGS += -Ifs/ocfs2



obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o



ocfs2_dlmfs-objs := userdlm.o dlmfs.o dlmfsver.o

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include "cluster/heartbeat.h"

#include "cluster/heartbeat.h"

#include "cluster/tcp.h"

#include "cluster/tcp.h"





#include "dlmapi.h"

#include "dlm/dlmapi.h"





#include "userdlm.h"

#include "userdlm.h"

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

+0 −0

File moved.

View file