diff options
| author | Brian Behlendorf <[email protected]> | 2012-08-25 15:01:39 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-26 13:55:45 -0700 |
| commit | cd38ac58a36e51cb3d627da57bfb5246e70f276d (patch) | |
| tree | 72708ba0789558062a46eaf6b2b86dc196ad4e15 | |
| parent | c90ea65511b93027dcf7b370457fcbda14103e19 (diff) | |
rmdir(2) should return ENOTEMPTY
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 <[email protected]>
Closes #895
| -rw-r--r-- | module/zfs/zfs_dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/zfs_dir.c b/module/zfs/zfs_dir.c index 6cd9c8508..670e31398 100644 --- a/module/zfs/zfs_dir.c +++ b/module/zfs/zfs_dir.c @@ -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. - * Can fail if zp is a mount point (EBUSY) or a non-empty directory (EEXIST). + * Unlink zp from dl, and mark zp for deletion if this was the last link. Can + * 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 it's non-NULL, we use it to indicate whether the znode needs deletion, * 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)) { mutex_exit(&zp->z_lock); - return (EEXIST); + return (ENOTEMPTY); } /* |