diff options
| author | jeff <jeff@FreeBSD.org> | 2014-03-06 00:10:07 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2014-03-06 00:10:07 +0000 |
| commit | f1c05bd42b549bdfbd6d418c0bb9c947293d9837 (patch) | |
| tree | fcb0df3fb901f8d8484047e4efd2043dee45dda8 /sys/ufs/ufs | |
| parent | 731420f10e9bc0c05578d1d16a184afebf9c059d (diff) | |
| download | FreeBSD-src-f1c05bd42b549bdfbd6d418c0bb9c947293d9837.zip FreeBSD-src-f1c05bd42b549bdfbd6d418c0bb9c947293d9837.tar.gz | |
- Gracefully handle truncation failures when trying to shrink directories.
This could cause dirhash panics since the dirhash state would be
successfully truncated while the directory was not.
Reported by: pho
Discussed with: mckusick
Sponsored by: EMC / Isilon Storage Division
MFC after: 2 weeks
Diffstat (limited to 'sys/ufs/ufs')
| -rw-r--r-- | sys/ufs/ufs/ufs_lookup.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 7068565..87a030e 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1130,12 +1130,15 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp, isrename) dp->i_endoff && dp->i_endoff < dp->i_size) { if (tvp != NULL) VOP_UNLOCK(tvp, 0); + error = UFS_TRUNCATE(dvp, (off_t)dp->i_endoff, + IO_NORMAL | IO_SYNC, cr); + if (error != 0) + vprint("ufs_direnter: failted to truncate", dvp); #ifdef UFS_DIRHASH - if (dp->i_dirhash != NULL) + if (error == 0 && dp->i_dirhash != NULL) ufsdirhash_dirtrunc(dp, dp->i_endoff); #endif - (void) UFS_TRUNCATE(dvp, (off_t)dp->i_endoff, - IO_NORMAL | IO_SYNC, cr); + error = 0; if (tvp != NULL) vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY); } |
