Merge tag 'v3.7-rc2' into drm-intel-next-queued

[~andy/linux] / fs / dlm / config.h

diff --git a/fs/dlm/config.h b/fs/dlm/config.h
index dbd35a08f3a5f4c4aa03c9495b33975400f68bfa..f30697bc2780dd25ff5586f70d17226c77d83e16 100644 (file)
--- a/fs/dlm/config.h
+++ b/fs/dlm/config.h
@@ -46,8 +46,6 @@ void dlm_config_exit(void);
 int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,
                     int *count_out);
 int dlm_comm_seq(int nodeid, uint32_t *seq);
-int dlm_nodeid_to_addr(int nodeid, struct sockaddr_storage *addr);
-int dlm_addr_to_nodeid(struct sockaddr_storage *addr, int *nodeid);
 int dlm_our_nodeid(void);
 int dlm_our_addr(struct sockaddr_storage *addr, int num);