diff options
| author | kib <kib@FreeBSD.org> | 2016-09-22 10:54:30 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-09-22 10:54:30 +0000 |
| commit | 454e7daab0b343b888c1efdf32cb029f6b2cf3d2 (patch) | |
| tree | 6c83b4b2e1785b134122a155aadf993db949fda9 | |
| parent | 6eb3bb940db1c2422de9f4c282d11b1152efaea5 (diff) | |
| download | FreeBSD-src-454e7daab0b343b888c1efdf32cb029f6b2cf3d2.zip FreeBSD-src-454e7daab0b343b888c1efdf32cb029f6b2cf3d2.tar.gz | |
MFC r305601:
On rename, do not perform truncation of dirhash if the vnode truncation failed.
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 4edd4ad..dfe829c 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1530,11 +1530,21 @@ unlockout: * are no longer needed. */ if (error == 0 && endoff != 0) { + error = UFS_TRUNCATE(tdvp, endoff, IO_NORMAL | IO_SYNC, + tcnp->cn_cred); + if (error != 0) + vn_printf(tdvp, "ufs_rename: failed to truncate " + "err %d", error); #ifdef UFS_DIRHASH - if (tdp->i_dirhash != NULL) + else if (tdp->i_dirhash != NULL) ufsdirhash_dirtrunc(tdp, endoff); #endif - UFS_TRUNCATE(tdvp, endoff, IO_NORMAL | IO_SYNC, tcnp->cn_cred); + /* + * Even if the directory compaction failed, rename was + * succesful. Do not propagate a UFS_TRUNCATE() error + * to the caller. + */ + error = 0; } if (error == 0 && tdp->i_flag & IN_NEEDSYNC) error = VOP_FSYNC(tdvp, MNT_WAIT, td); |
