c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove hw_serial, ddi_strtoul()

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13434
This commit is contained in:
наб
2022-05-07 19:18:41 +02:00
committed by Brian Behlendorf
parent 0c11a2738d
commit c25b281378
8 changed files with 9 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/os/freebsd/spl/spl_misc.c
-4
View File
@@ -43,15 +43,11 @@ static struct opensolaris_utsname hw_utsname = {
.machine = MACHINE
};
#ifndef KERNEL_STATIC
char hw_serial[11] = "0";
utsname_t *
utsname(void)
{
return (&hw_utsname);
}
#endif
static void
opensolaris_utsname_init(void *arg)
module/os/freebsd/spl/spl_sunddi.c
-13
View File
@@ -45,19 +45,6 @@ ddi_strtol(const char *str, char **nptr, int base, long *result)
return (0);
}
int
ddi_strtoul(const char *str, char **nptr, int base, unsigned long *result)
{
if (str == hw_serial) {
*result = prison0.pr_hostid;
return (0);
}
*result = strtoul(str, nptr, base);
return (0);
}
int
ddi_strtoull(const char *str, char **nptr, int base, unsigned long long *result)
{
module/os/linux/spl/spl-generic.c
+6 -6
View File
@@ -425,13 +425,13 @@ EXPORT_SYMBOL(__aeabi_ldivmod);
* functions against their Solaris counterparts. It is possible that I
* may have misinterpreted the man page or the man page is incorrect.
*/
int ddi_strtoul(const char *, char **, int, unsigned long *);
static int ddi_strtoul(const char *, char **, int, unsigned long *);
int ddi_strtol(const char *, char **, int, long *);
int ddi_strtoull(const char *, char **, int, unsigned long long *);
int ddi_strtoll(const char *, char **, int, long long *);
#define define_ddi_strtoux(type, valtype) \
int ddi_strtou##type(const char *str, char **endptr, \
#define define_ddi_strtoux(type, valtype, ...) \
__VA_ARGS__ int ddi_strtou##type(const char *str, char **endptr, \
int base, valtype *result) \
{ \
valtype last_value, value = 0; \
@@ -508,12 +508,12 @@ int ddi_strto##type(const char *str, char **endptr, \
return (rc); \
}
define_ddi_strtoux(l, unsigned long)
#define blank
define_ddi_strtoux(l, unsigned long, static)
define_ddi_strtox(l, long)
define_ddi_strtoux(ll, unsigned long long)
define_ddi_strtoux(ll, unsigned long long, blank)
define_ddi_strtox(ll, long long)
EXPORT_SYMBOL(ddi_strtoul);
EXPORT_SYMBOL(ddi_strtol);
EXPORT_SYMBOL(ddi_strtoll);
EXPORT_SYMBOL(ddi_strtoull);