From 0c767d38df9086d8342dfb8e20c8d881631acf27 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 28 Sep 2006 10:56:26 +1000 Subject: [PATCH] --- yaml --- r: 37125 b: refs/heads/master c: 673cdf5c72ff9551df08a71f2ac1a8fe02888e8d h: refs/heads/master i: 37123: 298f0ed3633ecdf39eb203a8d98ad6ff05449c5b v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_vnodeops.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 13063696b807..6163b2beca09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87395deb0b3d174ffcc7f66569764f0715ac5174 +refs/heads/master: 673cdf5c72ff9551df08a71f2ac1a8fe02888e8d diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c index 23cfa5837728..4fbc3e1cac00 100644 --- a/trunk/fs/xfs/xfs_vnodeops.c +++ b/trunk/fs/xfs/xfs_vnodeops.c @@ -4272,7 +4272,7 @@ xfs_free_file_space( xfs_mount_t *mp; int nimap; uint resblks; - int rounding; + uint rounding; int rt; xfs_fileoff_t startoffset_fsb; xfs_trans_t *tp; @@ -4313,8 +4313,7 @@ xfs_free_file_space( vn_iowait(vp); /* wait for the completion of any pending DIOs */ } - rounding = MAX((__uint8_t)(1 << mp->m_sb.sb_blocklog), - (__uint8_t)NBPP); + rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, NBPP); ilen = len + (offset & (rounding - 1)); ioffset = offset & ~(rounding - 1); if (ilen & (rounding - 1))