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

Finish refactoring for ZFS_MODULE_PARAM_CALL #10179

Merged
merged 1 commit into from
Apr 7, 2020
Merged

Finish refactoring for ZFS_MODULE_PARAM_CALL #10179

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
4 changes: 3 additions & 1 deletion include/os/linux/kernel/linux/mod_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,14 @@ enum scope_prefix_types {
* spa_slop_shift
*/
/* BEGIN CSTYLED */
#define ZFS_MODULE_PARAM_CALL(scope_prefix, name_prefix, name, setfunc, getfunc, perm, desc) \
#define ZFS_MODULE_PARAM_CALL(scope_prefix, name_prefix, name, setfunc, getfunc, perm, desc) \
CTASSERT_GLOBAL((sizeof (scope_prefix) == sizeof (enum scope_prefix_types))); \
module_param_call(name_prefix ## name, setfunc, getfunc, &name_prefix ## name, perm); \
MODULE_PARM_DESC(name_prefix ## name, desc)
/* END CSTYLED */

#define ZFS_MODULE_PARAM_ARGS const char *buf, zfs_kernel_param_t *kp
behlendorf marked this conversation as resolved.
Show resolved Hide resolved

#define ZFS_MODULE_DESCRIPTION(s) MODULE_DESCRIPTION(s)
#define ZFS_MODULE_AUTHOR(s) MODULE_AUTHOR(s)
#define ZFS_MODULE_LICENSE(s) MODULE_LICENSE(s)
Expand Down
4 changes: 2 additions & 2 deletions include/sys/arc_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,8 @@ extern uint64_t arc_free_memory(void);
extern int64_t arc_available_memory(void);
extern void arc_tuning_update(void);

extern int param_set_arc_long(const char *buf, zfs_kernel_param_t *kp);
extern int param_set_arc_int(const char *buf, zfs_kernel_param_t *kp);
extern int param_set_arc_long(ZFS_MODULE_PARAM_ARGS);
extern int param_set_arc_int(ZFS_MODULE_PARAM_ARGS);

#ifdef __cplusplus
}
Expand Down
8 changes: 4 additions & 4 deletions include/sys/spa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,10 +1179,10 @@ extern void spa_notify_waiters(spa_t *spa);
extern void spa_wake_waiters(spa_t *spa);

/* module param call functions */
int param_set_deadman_ziotime(const char *val, zfs_kernel_param_t *kp);
int param_set_deadman_synctime(const char *val, zfs_kernel_param_t *kp);
int param_set_slop_shift(const char *buf, zfs_kernel_param_t *kp);
int param_set_deadman_failmode(const char *val, zfs_kernel_param_t *kp);
int param_set_deadman_ziotime(ZFS_MODULE_PARAM_ARGS);
int param_set_deadman_synctime(ZFS_MODULE_PARAM_ARGS);
int param_set_slop_shift(ZFS_MODULE_PARAM_ARGS);
int param_set_deadman_failmode(ZFS_MODULE_PARAM_ARGS);

#ifdef ZFS_DEBUG
#define dprintf_bp(bp, fmt, ...) do { \
Expand Down
1 change: 1 addition & 0 deletions include/sys/zfs_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ typedef struct zfs_kernel_param {
} zfs_kernel_param_t;

#define ZFS_MODULE_PARAM(scope_prefix, name_prefix, name, type, perm, desc)
#define ZFS_MODULE_PARAM_ARGS void
#define ZFS_MODULE_PARAM_CALL(scope_prefix, name_prefix, name, setfunc, \
getfunc, perm, desc)

Expand Down
2 changes: 1 addition & 1 deletion module/zfs/spa_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2891,5 +2891,5 @@ ZFS_MODULE_PARAM(zfs, zfs_, special_class_metadata_reserve_pct, INT, ZMOD_RW,
"free space available");
/* END CSTYLED */

ZFS_MODULE_PARAM_CALL(spa, spa_, slop_shift, param_set_slop_shift,
ZFS_MODULE_PARAM_CALL(zfs_spa, spa_, slop_shift, param_set_slop_shift,
param_get_int, ZMOD_RW, "Reserved free space in pool");