[PATCH] OCFS2: The Second Oracle Cluster Filesystem

A distributed lock manager built with the cluster file system use case
in mind. The OCFS2 dlm exposes a VMS style API, though things have
been simplified internally. The only lock levels implemented currently
are NLMODE, PRMODE and EXMODE.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>

diff --cc fs/ocfs2/dlm/Makefile
Simple merge

diff --cc fs/ocfs2/dlm/dlmapi.h
Simple merge

diff --cc fs/ocfs2/dlm/dlmast.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmcommon.h
Simple merge

diff --cc fs/ocfs2/dlm/dlmconvert.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmconvert.h
Simple merge

diff --cc fs/ocfs2/dlm/dlmdebug.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmdebug.h
Simple merge

diff --cc fs/ocfs2/dlm/dlmdomain.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmdomain.h
Simple merge

diff --cc fs/ocfs2/dlm/dlmlock.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmmaster.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmrecovery.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmthread.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmunlock.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmver.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmver.h
Simple merge