rbd: recognize cephx_require_signatures and tcp_nodelay options

Support for these went into 3.19 and 4.0 kernels respectively.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst
index d55f78951ee3790353bb34c757f5f793d7ab50e9..7dd1d08e5ef3312e22a1f6f419054cf26bbd47de 100644 (file)
--- a/doc/man/8/rbd.rst
+++ b/doc/man/8/rbd.rst
@@ -366,6 +366,17 @@ the running kernel.
 
 * nocrc - Disable CRC32C checksumming for data writes.
 
+* cephx_require_signatures - Require cephx message signing, i.e. MSG_AUTH
+  feature bit (since 3.19, default).
+
+* nocephx_require_signatures - Don't require cephx message signing (since
+  3.19).
+
+* tcp_nodelay - Disable Nagle's algorithm on client sockets (since 4.0,
+  default).
+
+* notcp_nodelay - Enable Nagle's algorithm on client sockets (since 4.0).
+
 * osdkeepalive=x - OSD keepalive timeout (default is 5 seconds).
 
 * osd_idle_ttl=x - OSD idle TTL (default is 60 seconds).

diff --git a/man/rbd.8 b/man/rbd.8
index 4185dfc366af2b42babe8e512a0aac22edf39cb0..64f387393f6f6ea1cb3d1fec85e429be157b6e1f 100644 (file)
--- a/man/rbd.8
+++ b/man/rbd.8
@@ -435,6 +435,17 @@ crc \- Enable CRC32C checksumming for data writes (default).
 .IP \(bu 2
 nocrc \- Disable CRC32C checksumming for data writes.
 .IP \(bu 2
+cephx_require_signatures \- Require cephx message signing, i.e. MSG_AUTH
+feature bit (since 3.19, default).
+.IP \(bu 2
+nocephx_require_signatures \- Don\(aqt require cephx message signing (since
+3.19).
+.IP \(bu 2
+tcp_nodelay \- Disable Nagle\(aqs algorithm on client sockets (since 4.0,
+default).
+.IP \(bu 2
+notcp_nodelay \- Enable Nagle\(aqs algorithm on client sockets (since 4.0).
+.IP \(bu 2
 osdkeepalive=x \- OSD keepalive timeout (default is 5 seconds).
 .IP \(bu 2
 osd_idle_ttl=x \- OSD idle TTL (default is 60 seconds).

diff --git a/src/rbd.cc b/src/rbd.cc
index 553255b6563b7418fbd2b3fd6bc4792edcae65ce..e7ed6369b8209359ee429dc2493585ef6a4979eb 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -2398,6 +2398,12 @@ static int parse_map_options(char *options)
       put_map_option("share", this_char);
     } else if (!strcmp(this_char, "crc") || !strcmp(this_char, "nocrc")) {
       put_map_option("crc", this_char);
+    } else if (!strcmp(this_char, "cephx_require_signatures") ||
+               !strcmp(this_char, "nocephx_require_signatures")) {
+      put_map_option("cephx_require_signatures", this_char);
+    } else if (!strcmp(this_char, "tcp_nodelay") ||
+               !strcmp(this_char, "notcp_nodelay")) {
+      put_map_option("tcp_nodelay", this_char);
     } else if (!strcmp(this_char, "mount_timeout")) {
       if (put_map_option_value("mount_timeout", value_char, map_option_int_cb))
         return 1;