ceph 15.1.0 RC

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0003-src-common-bitstr.h.patch

@@ -1,11 +1,8 @@
---- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
+--- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
-+++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
++++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
-@@ -14,7 +14,10 @@
+@@ -17,6 +17,7 @@
- #ifndef CEPH_COMMON_BIT_STR_H
+ #include <cstdint>
- #define CEPH_COMMON_BIT_STR_H
+ #include <iosfwd>
- 
-+#include <cstdint>
-+#include <iosfwd>
  #include <functional>
 +#include <ostream>
  

0004-src-librbd-api-PoolMetadata.h.patch

@@ -1,10 +0,0 @@
---- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig	2020-01-24 12:39:23.738816885 -0500
-+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h	2020-01-24 12:39:36.522902386 -0500
-@@ -8,6 +8,7 @@
- #include "include/rados/librados_fwd.hpp"
- 
- #include <map>
-+#include <string>
- 
- namespace librbd {
- 

0005-mount.ceph-remove-arbitrary-limit-on-size-of-name-op.patch

@@ -1,135 +0,0 @@
-From 8db2a44c9438749be98d41fb309f10d5084805df Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlayton@redhat.com>
-Date: Fri, 17 Jan 2020 07:48:12 -0500
-Subject: [PATCH] mount.ceph: remove arbitrary limit on size of name= option
-
-Aaron was getting back -ERANGE errors when trying to mount using
-a long name= option. The issue is that the destination buffer for the
-"key=" string is not big enough to hold long names.
-
-When I overhauled the mount.ceph code recently, I made this buffer much
-smaller than before figuring that it didn't need to be any larger than
-the length of "secret=<base64 encoded key>".
-
-In the case where the secret is set in the keyring though, this buffer
-needs to be able to hold a string like "key=client.<cephx name>". The
-cephx name can be of arbitrary length, however.
-
-Rework the code to just safe_cat the strings directly into the options
-buffer, eliminating an extra copy and the need for an arbitrary limit.
-This also allows us to remove get_secret_option() from the the common
-code as well.
-
-Fixes: https://tracker.ceph.com/issues/43649
-Reported-by: Aaron <aarongmldt@gmail.com>
-Signed-off-by: Jeff Layton <jlayton@redhat.com>
----
- src/common/secret.h    |  7 ------
- src/mount/mount.ceph.c | 45 ++++++++++++++++++++++++-------------
- src/mount/mount.ceph.h |  3 ---
- 4 files changed, 30 insertions(+), 75 deletions(-)
-
-diff --git a/src/common/secret.h b/src/common/secret.h
-index b681fa1ec7..5d2ad179dd 100644
---- a/src/common/secret.h
-+++ b/src/common/secret.h
-@@ -7,13 +7,6 @@ extern "C" {
- 
- int read_secret_from_file(const char *filename, char *secret, size_t max_len);
- 
--/*
-- * Attempts to add the secret to the kernel, but falls back to
-- * the old secret= option if the kernel is too old.
-- */
--int get_secret_option(const char *secret, const char *key_name,
--		      char *secret_option, size_t secret_option_len);
--
- int set_kernel_secret(const char *secret, const char *key_name);
- 
- int is_kernel_secret(const char *key_name);
-diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c
-index e970648c59..133bc554f5 100644
---- a/src/mount/mount.ceph.c
-+++ b/src/mount/mount.ceph.c
-@@ -425,24 +425,39 @@ static void ceph_mount_info_free(struct ceph_mount_info *cmi)
- 	free(cmi->cmi_conf);
- }
- 
--static int finalize_options(struct ceph_mount_info *cmi)
-+static int append_key_or_secret_option(struct ceph_mount_info *cmi)
- {
--	int pos;
-+	int pos = strlen(cmi->cmi_opts);
- 
--	if (cmi->cmi_secret[0] || is_kernel_secret(cmi->cmi_name)) {
--		int ret;
--		char secret_option[SECRET_OPTION_BUFSIZE];
-+	if (!cmi->cmi_secret[0] && !is_kernel_secret(cmi->cmi_name))
-+		return 0;
- 
--		ret = get_secret_option(cmi->cmi_secret, cmi->cmi_name,
--					secret_option, sizeof(secret_option));
--		if (ret < 0)
-+	if (pos)
-+		pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, ",");
-+
-+	/* when parsing kernel options (-o remount) we get '<hidden>' as the secret */
-+	if (cmi->cmi_secret[0] && (strcmp(cmi->cmi_secret, "<hidden>") != 0)) {
-+		int ret = set_kernel_secret(cmi->cmi_secret, cmi->cmi_name);
-+		if (ret < 0) {
-+			if (ret == -ENODEV || ret == -ENOSYS) {
-+				/* old kernel; fall back to secret= in options */
-+				pos = safe_cat(&cmi->cmi_opts,
-+					       &cmi->cmi_opts_len, pos,
-+					       "secret=");
-+				pos = safe_cat(&cmi->cmi_opts,
-+					       &cmi->cmi_opts_len, pos,
-+					       cmi->cmi_secret);
-+				return 0;
-+			}
-+			fprintf(stderr, "adding ceph secret key to kernel failed: %s\n",
-+				strerror(-ret));
- 			return ret;
--
--		pos = strlen(cmi->cmi_opts);
--		if (pos)
--			pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, ",");
--		pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, secret_option);
-+		}
- 	}
-+
-+	pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, "key=");
-+	pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, cmi->cmi_name);
-+
- 	return 0;
- }
- 
-@@ -493,9 +508,9 @@ int main(int argc, char *argv[])
- 	/* Ensure the ceph key_type is available */
- 	modprobe();
- 
--	retval = finalize_options(&cmi);
-+	retval = append_key_or_secret_option(&cmi);
- 	if (retval) {
--		fprintf(stderr, "couldn't finalize options: %d\n", retval);
-+		fprintf(stderr, "couldn't append secret option: %d\n", retval);
- 		retval = EX_USAGE;
- 		goto out;
- 	}
-diff --git a/src/mount/mount.ceph.h b/src/mount/mount.ceph.h
-index c563597c43..b61176923d 100644
---- a/src/mount/mount.ceph.h
-+++ b/src/mount/mount.ceph.h
-@@ -21,9 +21,6 @@ extern "C" {
- /* Max Including null terminator */
- #define SECRET_BUFSIZE (MAX_SECRET_LEN + 1)
- 
--/* Buffer size for secret= option */
--#define SECRET_OPTION_BUFSIZE (sizeof("secret=") + MAX_SECRET_LEN + 1)
--
- /* 2k should be enough for anyone? */
- #define MON_LIST_BUFSIZE	2048
- 
--- 
-2.24.1
-

sources

@@ -1 +1 @@
-SHA512 (ceph-14.2.7.tar.gz) = 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
+SHA512 (ceph-15.1.0.tar.gz) = 3ff4d4865ff9838f779aa67da251072f6d2b3f280ec5b1693d9657fa8b7dc1692aabac1c0e00dbc502b08f924aac3f5f410eef0b0445832827a8ea7fb08c3b37