aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2021-03-16 12:44:23 +0000
committerBrian Behlendorf <[email protected]>2021-04-08 21:17:18 -0700
commit1dff54527806efb2e710a9c86370a43e33f8e03a (patch)
tree1e722198f0384b6e7601b16ebc8250c4f5a737b8
parent161ed825ca08abc6df5eb1215b4b46eb3ba5dc6d (diff)
Eliminate zfsdev_get_state_impl
After 3937ab20f zfsdev_get_state_impl can become zfsdev_get_state. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #11833
-rw-r--r--module/os/linux/zfs/zfs_ioctl_os.c2
-rw-r--r--module/zfs/zfs_ioctl.c16
2 files changed, 4 insertions, 14 deletions
diff --git a/module/os/linux/zfs/zfs_ioctl_os.c b/module/os/linux/zfs/zfs_ioctl_os.c
index 9b7ab647d..e9ae4c2a5 100644
--- a/module/os/linux/zfs/zfs_ioctl_os.c
+++ b/module/os/linux/zfs/zfs_ioctl_os.c
@@ -118,7 +118,7 @@ zfsdev_state_init(struct file *filp)
/*
* 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
* list whereas existing entries are already linked; the last
* operation must be updating zs_minor (from -1 to the new
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 7f929df16..53f16cd3d 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -7352,8 +7352,8 @@ zfsdev_getminor(int fd, minor_t *minorp)
return (SET_ERROR(EBADF));
}
-static void *
-zfsdev_get_state_impl(minor_t minor, enum zfsdev_state_type which)
+void *
+zfsdev_get_state(minor_t minor, enum zfsdev_state_type which)
{
zfsdev_state_t *zs;
@@ -7374,16 +7374,6 @@ zfsdev_get_state_impl(minor_t minor, enum zfsdev_state_type which)
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
* 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++) {
if (m > ZFSDEV_MAX_MINOR)
m = 1;
- if (zfsdev_get_state_impl(m, ZST_ALL) == NULL) {
+ if (zfsdev_get_state(m, ZST_ALL) == NULL) {
last_minor = m;
return (m);
}