|
|
| version 1.39, 2007/07/18 06:15:15 | version 1.40, 2007/08/02 16:01:27 |
|---|---|
| Line 2631 xfs_dm_probe_hole( | Line 2631 xfs_dm_probe_hole( |
| if (align == 0) | if (align == 0) |
| align = 1; | align = 1; |
| align <<= mp->m_sb.sb_blocklog; | align <<= mp->m_sb.sb_blocklog; |
| align = MAX(align, PAGE_CACHE_SIZE); | align = max_t(dm_size_t, align, PAGE_CACHE_SIZE); |
| error = xfs_dm_round_hole(off, len, align, realsize, &roff, &rlen); | error = xfs_dm_round_hole(off, len, align, realsize, &roff, &rlen); |
| if (error) | if (error) |
| Line 2694 xfs_dm_punch_hole( | Line 2694 xfs_dm_punch_hole( |
| align = 1; | align = 1; |
| align <<= mp->m_sb.sb_blocklog; | align <<= mp->m_sb.sb_blocklog; |
| align = MAX(align, PAGE_CACHE_SIZE); | align = max_t(dm_size_t, align, PAGE_CACHE_SIZE); |
| if ((off + len) > realsize) { | if ((off + len) > realsize) { |
| xfs_iunlock(ip, XFS_IOLOCK_EXCL); | xfs_iunlock(ip, XFS_IOLOCK_EXCL); |