d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ZFS_DEV macro instead of literals

Browse Source 
The rest of the code/comments use ZFS_DEV, so sync with that.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Closes #8912
This commit is contained in:
Tomohiro Kusumi 2019-06-20 04:27:31 +09:00 committed by Brian Behlendorf
parent 0b755ec3d5
commit fb0be12d7b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzfs_core/libzfs_core.c
View File

@ -52,7 +52,7 @@
* *
* - Thin Layer. libzfs_core is a thin layer, marshaling arguments * - Thin Layer. libzfs_core is a thin layer, marshaling arguments
* to/from the kernel ioctls. There is generally a 1:1 correspondence * to/from the kernel ioctls. There is generally a 1:1 correspondence
* between libzfs_core functions and ioctls to /dev/zfs. * between libzfs_core functions and ioctls to ZFS_DEV.
* *
* - Clear Atomicity. Because libzfs_core functions are generally 1:1 * - Clear Atomicity. Because libzfs_core functions are generally 1:1
* with kernel ioctls, and kernel ioctls are general atomic, each * with kernel ioctls, and kernel ioctls are general atomic, each
@ -135,7 +135,7 @@ libzfs_core_init(void)
{ {
(void) pthread_mutex_lock(&g_lock); (void) pthread_mutex_lock(&g_lock);
if (g_refcount == 0) { if (g_refcount == 0) {
g_fd = open("/dev/zfs", O_RDWR); g_fd = open(ZFS_DEV, O_RDWR);
if (g_fd < 0) { if (g_fd < 0) {
(void) pthread_mutex_unlock(&g_lock); (void) pthread_mutex_unlock(&g_lock);
return (errno); return (errno);
@ -499,7 +499,7 @@ lzc_sync(const char *pool_name, nvlist_t *innvl, nvlist_t **outnvl)
* The snapshots must all be in the same pool. * The snapshots must all be in the same pool.
* The value is the name of the hold (string type). * The value is the name of the hold (string type).
* *
* If cleanup_fd is not -1, it must be the result of open("/dev/zfs", O_EXCL). * If cleanup_fd is not -1, it must be the result of open(ZFS_DEV, O_EXCL).
* In this case, when the cleanup_fd is closed (including on process * In this case, when the cleanup_fd is closed (including on process
* termination), the holds will be released. If the system is shut down * termination), the holds will be released. If the system is shut down
* uncleanly, the holds will be released when the pool is next opened * uncleanly, the holds will be released when the pool is next opened

2
lib/libzpool/util.c
View File

@ -223,7 +223,7 @@ pool_active(void *unused, const char *name, uint64_t guid,
* Use ZFS_IOC_POOL_SYNC to confirm if a pool is active * Use ZFS_IOC_POOL_SYNC to confirm if a pool is active
*/ */
fd = open("/dev/zfs", O_RDWR); fd = open(ZFS_DEV, O_RDWR);
if (fd < 0) if (fd < 0)
return (-1); return (-1);