d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Gracefully handle truncation failures when trying to shrink directories.

Browse Source 
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
This commit is contained in:
Jeff Roberson 2014-03-06 00:10:07 +00:00
parent 1189b87f96
commit c13a58b022
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/ufs/ufs/ufs_lookup.c
View File

@ -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);
}