Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Klara update for json 

Fix checkstyle indicated errors, source format fixes

Signed-off-by: Fred Weigel <fred.weigel@klarasystems.com>
This commit is contained in:
Fred Weigel 2023-06-12 09:31:41 +00:00 committed by Geoff Amey
parent 2284c4d200
commit 6ccb1a75af
4 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/jprint.h
View File

@ -57,4 +57,3 @@ void jp_open(jprint_t *jp, char *buffer, size_t buflen);
int jp_close(jprint_t *jp); int jp_close(jprint_t *jp);
int jp_errorpos(jprint_t *jp); int jp_errorpos(jprint_t *jp);
int jp_printf(jprint_t *jp, const char *fmt, ...); int jp_printf(jprint_t *jp, const char *fmt, ...);

1
include/sys/json_stats.h
View File

@ -4,4 +4,3 @@
void json_stats_destroy(spa_t *spa); void json_stats_destroy(spa_t *spa);
void json_stats_init(spa_t *spa); void json_stats_init(spa_t *spa);

8
module/zfs/jprint.c
View File

@ -22,7 +22,7 @@
#endif #endif
/* literal key length maximum */ /* literal key length maximum */
#define KEYLEN 255 #define KEYLEN 5
/* return error position (call number of jp_printf) */ /* return error position (call number of jp_printf) */
int int
@ -46,7 +46,7 @@ jp_errorstring(int err)
case JPRINT_NO_DOUBLE: return "jprint no double support"; case JPRINT_NO_DOUBLE: return "jprint no double support";
default: return "jprint unknown error"; default: return "jprint unknown error";
} }
return "jprint unknown error"; return ("jprint unknown error");
} }
/* return error from jprint_t */ /* return error from jprint_t */
@ -349,7 +349,8 @@ jp_printf(jprint_t *jp, const char *fmt, ...)
} }
if (jp_key(jp, key) == JPRINT_OK) { if (jp_key(jp, key) == JPRINT_OK) {
b = (boolean_t)va_arg(ap, int); b = (boolean_t)va_arg(ap, int);
s = b ? (char *)"true" : s = b ?
(char *)"true" :
(char *)"false"; (char *)"false";
jp_puts(jp, s); jp_puts(jp, s);
} }
@ -443,4 +444,3 @@ jp_printf(jprint_t *jp, const char *fmt, ...)
return (int)(jp->bufp - start); return (int)(jp->bufp - start);
} }

6
module/zfs/zfs_ioctl.c
View File

@ -1598,7 +1598,9 @@ zfs_ioc_pool_configs(zfs_cmd_t *zc)
int error; int error;
if (fmgw_debug != 0) if (fmgw_debug != 0)
zfs_dbgmsg("fmgw -- calling spa_all_configs, which takes spa_namespace_lock"); zfs_dbgmsg(
"fmgw -- calling spa_all_configs,"
"which takes spa_namespace_lock");
if ((configs = spa_all_configs(&zc->zc_cookie)) == NULL) if ((configs = spa_all_configs(&zc->zc_cookie)) == NULL)
return (SET_ERROR(EEXIST)); return (SET_ERROR(EEXIST));
@ -7475,8 +7477,6 @@ zfsdev_ioctl_common(uint_t vecnum, zfs_cmd_t *zc, int flag)
if (vec->zvec_func == NULL && vec->zvec_legacy_func == NULL) if (vec->zvec_func == NULL && vec->zvec_legacy_func == NULL)
return (SET_ERROR(ZFS_ERR_IOC_CMD_UNAVAIL)); return (SET_ERROR(ZFS_ERR_IOC_CMD_UNAVAIL));
// if (fmgw_debug != 0)
// zfs_dbgmsg("enter ioctl, %d %x %s", vecnum, vecnum, fmgw_zioctl(vecnum + ZFS_IOC_FIRST));
zc->zc_iflags = flag & FKIOCTL; zc->zc_iflags = flag & FKIOCTL;
max_nvlist_src_size = zfs_max_nvlist_src_size_os(); max_nvlist_src_size = zfs_max_nvlist_src_size_os();
if (zc->zc_nvlist_src_size > max_nvlist_src_size) { if (zc->zc_nvlist_src_size > max_nvlist_src_size) {