c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

OpenZFS 7336 - vfork and O_CLOEXEC causes zfs_mount EBUSY

Browse Source 
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 <prakash.surya@delphix.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

OpenZFS-issue: https://www.illumos.org/issues/7336
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/dd862f6d
Closes #5651
This commit is contained in:
George Melikov
2017-01-26 23:28:29 +03:00
committed by Brian Behlendorf
parent f925de3a20
commit 774ee3c7ce
6 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/runfiles/linux.run
+1 -1
View File
@@ -131,7 +131,7 @@ tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg']
[tests/functional/cli_root/zfs_mount]
tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
'zfs_mount_004_pos', 'zfs_mount_005_pos', 'zfs_mount_008_pos',
'zfs_mount_010_neg', 'zfs_mount_011_neg']
'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg']
[tests/functional/cli_root/zfs_promote]
tests = ['zfs_promote_001_pos', 'zfs_promote_002_pos', 'zfs_promote_003_pos',
tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
+1
View File
@@ -15,4 +15,5 @@ dist_pkgdata_SCRIPTS = \
zfs_mount_009_neg.ksh \
zfs_mount_010_neg.ksh \
zfs_mount_011_neg.ksh \
zfs_mount_012_neg.ksh \
zfs_mount_all_001_pos.ksh
tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_012_neg.ksh
Executable
+50
View File
@@ -0,0 +1,50 @@
#!/bin/ksh -p
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright (c) 2015 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
#
# DESCRIPTION:
# Verify that zfs mount should fail with a non-empty directory
#
# STRATEGY:
# 1. Unmount the dataset
# 2. Create a new empty directory
# 3. Set the dataset's mountpoint
# 4. Attempt to mount the dataset
# 5. Verify the mount succeeds
# 6. Unmount the dataset
# 7. Create a file in the directory created in step 2
# 8. Attempt to mount the dataset
# 9. Verify the mount fails
#
verify_runnable "both"
log_assert "zfs mount fails with non-empty directory"
fs=$TESTPOOL/$TESTFS
log_must $ZFS umount $fs
log_must mkdir -p $TESTDIR
log_must $ZFS set mountpoint=$TESTDIR $fs
log_must $ZFS mount $fs
log_must $ZFS umount $fs
log_must touch $TESTDIR/testfile.$$
log_mustnot $ZFS mount $fs
log_must rm -rf $TESTDIR
log_pass "zfs mount fails non-empty directory as expected."