Skip to content

mount.ceph,test: fix -Werror build with clang 21 and glibc 2.43 #73722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Doracly wants to merge 3 commits into
base: main
Choose a base branch
from
+15 −15
Open

mount.ceph,test: fix -Werror build with clang 21 and glibc 2.43 #73722

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbed485
mount.ceph: fix const-ness of strstr() and strchr() results
Doracly Nov 10, 2026
12210a8
test/fs: initialize buf in test_trim_caps
Doracly Nov 10, 2026
1199f9a
test/rgw: drop unused lambda captures in test_d4n_filter
Doracly Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
mount.ceph: fix const-ness of strstr() and strchr() results 
With _GNU_SOURCE, glibc 2.43 returns const char * from strstr() and
strchr() for a const string, so assigning the result to char * fails
with -Werror on clang and gcc.

Make the pointers into dev_str const. parse_options() writes into its
argument, so pass it the non-const optarg. A missing -o was marked by
the address of the const EMPTY_STRING; the now non-const opts uses
NULL instead, so drop EMPTY_STRING.

Assisted-by: claude-opus-5-5
Signed-off-by: Dominik Raddatz <dominik.raddatz@clyso.com>
  • Loading branch information
@Doracly
Doracly committed Nov 10, 2026
commit fbed485a3bdd90bb39c6e67c3d7b248a11ed08b3
22 changes: 11 additions & 11 deletions src/mount/mount.ceph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ bool v2_addrs = true;
bool no_fallback = false;
bool ms_mode_specified = false;
bool mon_addr_specified = false;
static const char * const EMPTY_STRING = "";

/* TODO duplicates logic from kernel */
#define CEPH_AUTH_NAME_DEFAULT "guest"
Expand Down Expand Up @@ -191,7 +190,7 @@ static int parse_old_dev(const char *dev_str, struct ceph_mount_info *cmi,
int *opt_pos)
{
size_t len;
char *mount_path;
const char *mount_path;

mount_path = strstr(dev_str, ":/");
if (!mount_path) {
Expand Down Expand Up @@ -231,9 +230,9 @@ static int parse_new_dev(const char *dev_str, struct ceph_mount_info *cmi,
{
size_t len;
char *name;
char *name_end;
char *dot;
char *fs_name;
const char *name_end;
const char *dot;
const char *fs_name;

name_end = strstr(dev_str, "@");
if (!name_end) {
Expand Down Expand Up @@ -473,13 +472,13 @@ static int fetch_config_info(struct ceph_mount_info *cmi)
/*
* this one is partially based on parse_options() from cifs.mount.c
*/
static int parse_options(const char *data, struct ceph_mount_info *cmi,
static int parse_options(char *data, struct ceph_mount_info *cmi,
int *opt_pos)
{
char * next_keyword = NULL;
char *name = NULL;

if (data == EMPTY_STRING)
if (!data)
goto out;

mount_ceph_debug("parsing options: %s\n", data);
Expand Down Expand Up @@ -637,7 +636,7 @@ static int parse_options(const char *data, struct ceph_mount_info *cmi,
mount_ceph_debug("mount.ceph: options \"%s\".\n", cmi->cmi_opts);

if (!cmi->cmi_opts) {
cmi->cmi_opts = strdup(EMPTY_STRING);
cmi->cmi_opts = strdup("");
if (!cmi->cmi_opts)
return -ENOMEM;
}
Expand All @@ -646,7 +645,7 @@ static int parse_options(const char *data, struct ceph_mount_info *cmi,


static int parse_arguments(int argc, char *const *const argv,
const char **src, const char **node, const char **opts)
const char **src, const char **node, char **opts)
{
int opt = 0;
static struct option long_options[] = {
Expand Down Expand Up @@ -674,7 +673,7 @@ static int parse_arguments(int argc, char *const *const argv,
*node = argv[2];

// Parse the remaining options
*opts = EMPTY_STRING;
*opts = NULL;
while ((opt = getopt_long(argc, argv, "hnvfo:",
long_options, NULL)) != -1) {
switch (opt) {
Expand Down Expand Up @@ -975,7 +974,8 @@ static int append_key_or_secret_option(struct ceph_mount_info *cmi)
int main(int argc, char *argv[])
{
int opt_pos = 0;
const char *dev, *node, *opts;
const char *dev, *node;
char *opts;
int retval;
struct ceph_mount_info cmi = { 0 };

Expand Down