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

Eliminate zfsdev_get_state_impl 

After 3937ab20f zfsdev_get_state_impl can become zfsdev_get_state.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #11833
This commit is contained in:
Ryan Moeller 2021-03-16 12:44:23 +00:00 committed by Brian Behlendorf
parent 161ed825ca
commit 1dff545278
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/os/linux/zfs/zfs_ioctl_os.c
View File

@ -118,7 +118,7 @@ zfsdev_state_init(struct file *filp)
/* /*
* In order to provide for lock-free concurrent read access * In order to provide for lock-free concurrent read access
* to the minor list in zfsdev_get_state_impl(), new entries * to the minor list in zfsdev_get_state(), new entries
* must be completely written before linking them into the * must be completely written before linking them into the
* list whereas existing entries are already linked; the last * list whereas existing entries are already linked; the last
* operation must be updating zs_minor (from -1 to the new * operation must be updating zs_minor (from -1 to the new

16
module/zfs/zfs_ioctl.c
View File

@ -7352,8 +7352,8 @@ zfsdev_getminor(int fd, minor_t *minorp)
return (SET_ERROR(EBADF)); return (SET_ERROR(EBADF));
} }
static void * void *
zfsdev_get_state_impl(minor_t minor, enum zfsdev_state_type which) zfsdev_get_state(minor_t minor, enum zfsdev_state_type which)
{ {
zfsdev_state_t *zs; zfsdev_state_t *zs;
@ -7374,16 +7374,6 @@ zfsdev_get_state_impl(minor_t minor, enum zfsdev_state_type which)
return (NULL); return (NULL);
} }
void *
zfsdev_get_state(minor_t minor, enum zfsdev_state_type which)
{
void *ptr;
ptr = zfsdev_get_state_impl(minor, which);
return (ptr);
}
/* /*
* Find a free minor number. The zfsdev_state_list is expected to * Find a free minor number. The zfsdev_state_list is expected to
* be short since it is only a list of currently open file handles. * be short since it is only a list of currently open file handles.
@ -7399,7 +7389,7 @@ zfsdev_minor_alloc(void)
for (m = last_minor + 1; m != last_minor; m++) { for (m = last_minor + 1; m != last_minor; m++) {
if (m > ZFSDEV_MAX_MINOR) if (m > ZFSDEV_MAX_MINOR)
m = 1; m = 1;
if (zfsdev_get_state_impl(m, ZST_ALL) == NULL) { if (zfsdev_get_state(m, ZST_ALL) == NULL) {
last_minor = m; last_minor = m;
return (m); return (m);
} }