diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-07-14 17:37:18 -0400 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-07-14 17:37:18 -0400 |
| commit | 7f8a058f6dc52219117bc2469b1fb816f7fa1a4b (patch) | |
| tree | 43ce8eed4d26beb6f2acff2279c43eae7f79f83a /fs/xfs/xfs_linux.h | |
| parent | 03e01349c654fbdea80d3d9b4ab599244eb55bb7 (diff) | |
| parent | 2451337dd043901b5270b7586942abe564443e3d (diff) | |
Merge branch 'xfs-libxfs-restructure' into for-next
Diffstat (limited to 'fs/xfs/xfs_linux.h')
| -rw-r--r-- | fs/xfs/xfs_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 825249d2dfc1..f59b966bf903 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h | |||
| @@ -331,7 +331,7 @@ static inline __uint64_t roundup_64(__uint64_t x, __uint32_t y) | |||
| 331 | { | 331 | { |
| 332 | x += y - 1; | 332 | x += y - 1; |
| 333 | do_div(x, y); | 333 | do_div(x, y); |
| 334 | return(x * y); | 334 | return x * y; |
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) | 337 | static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) |