diff options
author | Patrick Caulfield <pcaulfie@redhat.com> | 2007-04-17 16:39:57 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-05-01 10:11:23 +0200 |
commit | 6ed7257b46709e87d79ac2b6b819b7e0c9184998 (patch) | |
tree | 502f68849175f8fb52bb141501df2df9efc8e06c /fs/dlm/Makefile | |
parent | [DLM] Remove redundant assignment (diff) | |
download | linux-6ed7257b46709e87d79ac2b6b819b7e0c9184998.tar.xz linux-6ed7257b46709e87d79ac2b6b819b7e0c9184998.zip |
[DLM] Consolidate transport protocols
This patch consolidates the TCP & SCTP protocols for the DLM into a single file
and makes it switchable at run-time (well, at least before the DLM actually
starts up!)
For RHEL5 this patch requires Neil Horman's patch that expands the in-kernel
socket API but that has already been twice ACKed so it should be OK.
The patch adds a new lowcomms.c file that replaces the existing lowcomms-sctp.c
& lowcomms-tcp.c files.
Signed-off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm/Makefile')
-rw-r--r-- | fs/dlm/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/dlm/Makefile b/fs/dlm/Makefile index 65388944eba0..604cf7dc5f39 100644 --- a/fs/dlm/Makefile +++ b/fs/dlm/Makefile @@ -8,14 +8,12 @@ dlm-y := ast.o \ member.o \ memory.o \ midcomms.o \ + lowcomms.o \ rcom.o \ recover.o \ recoverd.o \ requestqueue.o \ user.o \ - util.o + util.o dlm-$(CONFIG_DLM_DEBUG) += debug_fs.o -dlm-$(CONFIG_DLM_TCP) += lowcomms-tcp.o - -dlm-$(CONFIG_DLM_SCTP) += lowcomms-sctp.o
\ No newline at end of file |