summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormckusick <mckusick@FreeBSD.org>2013-02-03 17:16:32 +0000
committermckusick <mckusick@FreeBSD.org>2013-02-03 17:16:32 +0000
commit1858329b43a5e7ea4bd21fc00d9a153c6878f21f (patch)
treebb4b13cc083564b15f377af4a98da39c1467af45
parent6fa139d56eac8251b9a64c249c8e6fc8131f405c (diff)
downloadFreeBSD-src-1858329b43a5e7ea4bd21fc00d9a153c6878f21f.zip
FreeBSD-src-1858329b43a5e7ea4bd21fc00d9a153c6878f21f.tar.gz
For UFS2 i_blocks is unsigned. The current "sanity" check that it
has gone below zero after the blocks in its inode are freed is a no-op which the compiler fails to warn about because of the use of the DIP macro. Change the sanity check to compare the number of blocks being freed against the value i_blocks. If the number of blocks being freed exceeds i_blocks, just set i_blocks to zero. Reported by: Pedro Giffuni (pfg@) MFC after: 2 weeks
-rw-r--r--sys/ufs/ffs/ffs_inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index f8584d5..4571a1c 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -546,9 +546,9 @@ done:
*/
ip->i_size = length;
DIP_SET(ip, i_size, length);
- DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - blocksreleased);
-
- if (DIP(ip, i_blocks) < 0) /* sanity */
+ if (DIP(ip, i_blocks) >= blocksreleased)
+ DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - blocksreleased);
+ else /* sanity */
DIP_SET(ip, i_blocks, 0);
ip->i_flag |= IN_CHANGE;
#ifdef QUOTA
OpenPOWER on IntegriCloud