Skip to content
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

FreeBSD: Add const qualifier to members of struct opensolaris_utsname #16210

Merged
merged 1 commit into from
May 30, 2024
Merged

FreeBSD: Add const qualifier to members of struct opensolaris_utsname #16210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions include/os/freebsd/spl/sys/misc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
#define F_SEEK_HOLE FIOSEEKHOLE

struct opensolaris_utsname {
char *sysname;
char *nodename;
char *release;
char version[32];
char *machine;
const char *sysname;
const char *nodename;
const char *release;
char version[32];
const char *machine;
};

#define task_io_account_read(n)
Expand Down
7 changes: 3 additions & 4 deletions module/os/freebsd/spl/spl_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
#include <sys/zfs_context.h>

static struct opensolaris_utsname hw_utsname = {
.sysname = ostype,
.nodename = prison0.pr_hostname,
.release = osrelease,
.machine = MACHINE
};

Expand All @@ -49,10 +52,6 @@ utsname(void)
static void
opensolaris_utsname_init(void *arg)
{

hw_utsname.sysname = ostype;
hw_utsname.nodename = prison0.pr_hostname;
hw_utsname.release = osrelease;
snprintf(hw_utsname.version, sizeof (hw_utsname.version),
"%d", osreldate);
}
Expand Down
Loading