[SCM] CTDB repository - branch master updated - ctdb-1.0.114-310-g2ce34e5

[Ronnie Sahlberg]

The branch, master has been updated
       via  2ce34e50d057ba95249117a581658a5ad7e8eb60 (commit)
       via  84a44ac8ee74dd7af15e378c6cafbedb95feec60 (commit)
       via  4cd4bab68f0ba0305a585a2aabcb6871cdb11d96 (commit)
      from  31c10eb2b337fd7d8a97a1f9e69b0e7570fec71d (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2ce34e50d057ba95249117a581658a5ad7e8eb60
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Sep 13 15:08:36 2010 +1000

    Update the comment for the range reserved for SAMBA and
    define a new symbol to represent this range similarly to NFSD and ISCSID
    
    Keep the old symbol name to be backward compatible with software using
    these headers.

commit 84a44ac8ee74dd7af15e378c6cafbedb95feec60
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Sep 13 15:06:43 2010 +1000

    define and reserve a range of ctdb message ports for use by nfs and iscsi servers

commit 4cd4bab68f0ba0305a585a2aabcb6871cdb11d96
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Sep 13 15:01:47 2010 +1000

    Add two new server types to the server_id structure.
    NFSD and ISCSID for now.

-----------------------------------------------------------------------

Summary of changes:
 include/ctdb_client.h   |    6 +++++-
 include/ctdb_protocol.h |   17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_client.h b/include/ctdb_client.h
index 16ed9c0..2b709a0 100644
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -415,7 +415,11 @@ int ctdb_ctrl_modflags(struct ctdb_context *ctdb,
 		       uint32_t destnode,
 		       uint32_t set, uint32_t clear);
 
-enum ctdb_server_id_type { SERVER_TYPE_SAMBA=1 };
+enum ctdb_server_id_type {
+	SERVER_TYPE_SAMBA=1,
+	SERVER_TYPE_NFSD=2,
+	SERVER_TYPE_ISCSID=3
+};
 
 struct ctdb_server_id {
 	enum ctdb_server_id_type type;
diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index 8c90675..4cd3fca 100644
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -131,9 +131,24 @@ struct ctdb_call_info {
 */
 #define CTDB_SRVID_TAKEOVER_RUN_RESPONSE  0xFD00000000000000LL
 
-/* A port reserved for samba (top 32 bits)
+/* A range of ports reserved for samba (top 32 bits)
+ * All ports matching the 32 top bits are reserved for exclusive use by
+ * CIFS server
  */
 #define CTDB_SRVID_SAMBA_NOTIFY  0xFE00000000000000LL
+#define CTDB_SRVID_SAMBA_RANGE   0xFE00000000000000LL
+
+/* A range of ports reserved for a CTDB NFS server (top 32 bits)
+ * All ports matching the 32 top bits are reserved for exclusive use by
+ * NFS server
+ */
+#define CTDB_SRVID_NFSD_RANGE  0xFE01000000000000LL
+
+/* A range of ports reserved for a CTDB ISCSI server (top 32 bits)
+ * All ports matching the 32 top bits are reserved for exclusive use by
+ * ISCSI server
+ */
+#define CTDB_SRVID_ISCSID_RANGE  0xFE02000000000000LL
 
 /* used on the domain socket, send a pdu to the local daemon */
 #define CTDB_CURRENT_NODE     0xF0000001


-- 
CTDB repository