c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

rmdir(2) should return ENOTEMPTY

Browse Source 
Under Solaris the behavior for rmdir(2) is to return EEXIST when
a directory still contains entries.  However, on Linux ENOTEMPTY
is the expected return value with EEXIST being technically allowed.
According to rmdir(2):

ENOTEMPTY
   pathname contains entries other than . and .. ; or, pathname has
   ..  as its final component.  POSIX.1-2001 also allows EEXIST for
   this condition.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #895
This commit is contained in:
Brian Behlendorf 2012-08-25 15:01:39 -07:00
parent c90ea65511
commit cd38ac58a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/zfs_dir.c
View File

@ -837,8 +837,8 @@ zfs_dropname(zfs_dirlock_t *dl, znode_t *zp, znode_t *dzp, dmu_tx_t *tx,
} }
/* /*
* Unlink zp from dl, and mark zp for deletion if this was the last link. * Unlink zp from dl, and mark zp for deletion if this was the last link. Can
* Can fail if zp is a mount point (EBUSY) or a non-empty directory (EEXIST). * fail if zp is a mount point (EBUSY) or a non-empty directory (ENOTEMPTY).
* If 'unlinkedp' is NULL, we put unlinked znodes on the unlinked list. * If 'unlinkedp' is NULL, we put unlinked znodes on the unlinked list.
* If it's non-NULL, we use it to indicate whether the znode needs deletion, * If it's non-NULL, we use it to indicate whether the znode needs deletion,
* and it's the caller's job to do it. * and it's the caller's job to do it.
@ -865,7 +865,7 @@ zfs_link_destroy(zfs_dirlock_t *dl, znode_t *zp, dmu_tx_t *tx, int flag,
if (zp_is_dir && !zfs_dirempty(zp)) { if (zp_is_dir && !zfs_dirempty(zp)) {
mutex_exit(&zp->z_lock); mutex_exit(&zp->z_lock);
return (EEXIST); return (ENOTEMPTY);
} }
/* /*