diff options
| author | pfg <pfg@FreeBSD.org> | 2016-05-10 02:13:17 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-05-10 02:13:17 +0000 |
| commit | a47a2ab7d174a12dbad2a21cf49faab2263b661b (patch) | |
| tree | 95a24702c971a7db696345409bf19b71ba84997e /sys/fs | |
| parent | 1708fafa25d9413ab466d3670d803e2ebf885d45 (diff) | |
| download | FreeBSD-src-a47a2ab7d174a12dbad2a21cf49faab2263b661b.zip FreeBSD-src-a47a2ab7d174a12dbad2a21cf49faab2263b661b.tar.gz | |
MFC r298609:
ext2fs: make use of the howmany() macro when available.
We have a howmany() macro in the <sys/param.h> header that is
convenient to re-use as it makes things easier to read.
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/ext2fs/ext2_vfsops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c index a1f3c51..9f2b94c 100644 --- a/sys/fs/ext2fs/ext2_vfsops.c +++ b/sys/fs/ext2fs/ext2_vfsops.c @@ -357,10 +357,10 @@ compute_sb_data(struct vnode *devvp, struct ext2fs *es, fs->e2fs_ipb = fs->e2fs_bsize / EXT2_INODE_SIZE(fs); fs->e2fs_itpg = fs->e2fs_ipg / fs->e2fs_ipb; /* s_resuid / s_resgid ? */ - fs->e2fs_gcount = (es->e2fs_bcount - es->e2fs_first_dblock + - EXT2_BLOCKS_PER_GROUP(fs) - 1) / EXT2_BLOCKS_PER_GROUP(fs); + fs->e2fs_gcount = howmany(es->e2fs_bcount - es->e2fs_first_dblock, + EXT2_BLOCKS_PER_GROUP(fs)); e2fs_descpb = fs->e2fs_bsize / sizeof(struct ext2_gd); - db_count = (fs->e2fs_gcount + e2fs_descpb - 1) / e2fs_descpb; + db_count = howmany(fs->e2fs_gcount, e2fs_descpb); fs->e2fs_gdbcount = db_count; fs->e2fs_gd = malloc(db_count * fs->e2fs_bsize, M_EXT2MNT, M_WAITOK); @@ -970,7 +970,7 @@ ext2_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) */ if (!(ip->i_flag & IN_E4EXTENTS) && (S_ISDIR(ip->i_mode) || S_ISREG(ip->i_mode))) { - used_blocks = (ip->i_size+fs->e2fs_bsize-1) / fs->e2fs_bsize; + used_blocks = howmany(ip->i_size, fs->e2fs_bsize); for (i = used_blocks; i < EXT2_NDIR_BLOCKS; i++) ip->i_db[i] = 0; } |
