diff options
| author | George Melikov <[email protected]> | 2017-01-26 23:28:29 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-26 12:28:29 -0800 |
| commit | 774ee3c7cec223521f41a4c533f2561da43ee425 (patch) | |
| tree | d31d6f7ec373f0cf705c530c117164891c5976aa /include | |
| parent | f925de3a20e97d3b9ee854c8435c6f3d8d17e02c (diff) | |
OpenZFS 7336 - vfork and O_CLOEXEC causes zfs_mount EBUSY
Porting notes:
- statvfs64 is replaced by statfs64.
- ZFS_SUPER_MAGIC definition moved in include/sys/fs/zfs.h
to share it between user and kernel space.
Authored by: Prakash Surya <[email protected]>
Reviewed by: Matt Ahrens <[email protected]>
Reviewed by: Paul Dagnelie <[email protected]>
Reviewed by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7336
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/dd862f6d
Closes #5651
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/fs/zfs.h | 2 | ||||
| -rw-r--r-- | include/sys/zfs_vfsops.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index e95e8ce68..962698c2f 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -924,6 +924,8 @@ typedef struct ddt_histogram { #define ZFS_DEV "/dev/zfs" #define ZFS_SHARETAB "/etc/dfs/sharetab" +#define ZFS_SUPER_MAGIC 0x2fc12fc1 + /* general zvol path */ #define ZVOL_DIR "/dev" diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h index 870eb9727..e38cadc33 100644 --- a/include/sys/zfs_vfsops.h +++ b/include/sys/zfs_vfsops.h @@ -119,8 +119,6 @@ typedef struct zfs_sb { kmutex_t *z_hold_locks; /* znode hold locks */ } zfs_sb_t; -#define ZFS_SUPER_MAGIC 0x2fc12fc1 - #define ZSB_XATTR 0x0001 /* Enable user xattrs */ /* |