diff options
| author | pfg <pfg@FreeBSD.org> | 2013-02-08 21:09:44 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2013-02-08 21:09:44 +0000 |
| commit | c03e3032d5b1c0469a386da4410584ebdaa8188a (patch) | |
| tree | f2b38f4a98682ecb38ecb01dec70d1234ea3798c | |
| parent | 9694490e0d77386d377b15305ceca5de581af61d (diff) | |
| download | FreeBSD-src-c03e3032d5b1c0469a386da4410584ebdaa8188a.zip FreeBSD-src-c03e3032d5b1c0469a386da4410584ebdaa8188a.tar.gz | |
ext2fs: Replace redundant EXT2_MIN_BLOCK with EXT2_MIN_BLOCK_SIZE.
Submitted by: Christoph Mallon
MFC after: 2 weeks
| -rw-r--r-- | sys/fs/ext2fs/ext2_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/ext2fs/ext2fs.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c index d0f3edb..cdb41ba 100644 --- a/sys/fs/ext2fs/ext2_vfsops.c +++ b/sys/fs/ext2fs/ext2_vfsops.c @@ -320,8 +320,8 @@ compute_sb_data(struct vnode *devvp, struct ext2fs *es, struct buf *bp; uint32_t e2fs_descpb; - fs->e2fs_bsize = EXT2_MIN_BLOCK_SIZE << es->e2fs_log_bsize; fs->e2fs_bshift = EXT2_MIN_BLOCK_LOG_SIZE + es->e2fs_log_bsize; + fs->e2fs_bsize = 1U << fs->e2fs_bshift; fs->e2fs_fsbtodb = es->e2fs_log_bsize + 1; fs->e2fs_qbmask = fs->e2fs_bsize - 1; fs->e2fs_fsize = EXT2_MIN_FRAG_SIZE << es->e2fs_log_fsize; diff --git a/sys/fs/ext2fs/ext2fs.h b/sys/fs/ext2fs/ext2fs.h index 02cdcda..225e058 100644 --- a/sys/fs/ext2fs/ext2fs.h +++ b/sys/fs/ext2fs/ext2fs.h @@ -303,7 +303,6 @@ struct csum { /* * Macro-instructions used to manage several block sizes */ -#define EXT2_MIN_BLOCK_SIZE 1024 #define EXT2_MAX_BLOCK_SIZE 4096 #define EXT2_MIN_BLOCK_LOG_SIZE 10 #define EXT2_BLOCK_SIZE(s) ((s)->e2fs_bsize) |
