diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-25 11:46:39 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-07-25 11:46:39 +0000 |
| commit | fc4c8a6f3e101c3b4282926f35a2c8b26cde8a33 (patch) | |
| tree | 9a91c193d87f9daa1e2359527ce90f89a35deed6 /usr/src/uts/common/fs/tmpfs/tmp_vnops.c | |
| parent | 8040f525a5e0fefc7427bbe63f8f09e746ef0687 (diff) | |
| parent | cc366bfc297550eb10cd5f677d98c8d206eca4f1 (diff) | |
| download | illumos-joyent-fc4c8a6f3e101c3b4282926f35a2c8b26cde8a33.tar.gz | |
[illumos-gate merge]
commit cc366bfc297550eb10cd5f677d98c8d206eca4f1
7038 users of endian.h expect __ prefixed versions of macros
7043 endian.h uses bad macros for _BIG_ENDIAN
commit cda73f64f20b8a0afc4909f5ea1f055ec7913856
7139 Sync mDNS with mDNSResponder-625.41.2
commit 6da83bb0b886fae280a129718d645576517b62c6
7203 unlinking a directory on tmpfs does not remove the directory entries
Diffstat (limited to 'usr/src/uts/common/fs/tmpfs/tmp_vnops.c')
| -rw-r--r-- | usr/src/uts/common/fs/tmpfs/tmp_vnops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/tmpfs/tmp_vnops.c b/usr/src/uts/common/fs/tmpfs/tmp_vnops.c index 18e037ee22..98951ed751 100644 --- a/usr/src/uts/common/fs/tmpfs/tmp_vnops.c +++ b/usr/src/uts/common/fs/tmpfs/tmp_vnops.c @@ -27,6 +27,7 @@ /* * Copyright 2016, Joyent, Inc. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. + * Copyright 2016 RackTop Systems. */ #include <sys/types.h> @@ -1119,7 +1120,8 @@ tmp_remove( if (tp->tn_type != VDIR || (error = secpolicy_fs_linkdir(cred, dvp->v_vfsp)) == 0) - error = tdirdelete(parent, tp, nm, DR_REMOVE, cred); + error = tdirdelete(parent, tp, nm, tp->tn_type == VDIR ? + DR_RMDIR : DR_REMOVE, cred); rw_exit(&tp->tn_rwlock); rw_exit(&parent->tn_rwlock); |