svn commit: r246564 - head/sys/fs/ext2fs

[Pedro F. Giffuni]

Author: pfg
Date: Fri Feb  8 21:09:44 2013
New Revision: 246564
URL: http://svnweb.freebsd.org/changeset/base/246564

Log:
  ext2fs: Replace redundant EXT2_MIN_BLOCK with EXT2_MIN_BLOCK_SIZE.
  
  Submitted by:	Christoph Mallon
  MFC after:	2 weeks

Modified:
  head/sys/fs/ext2fs/ext2_vfsops.c
  head/sys/fs/ext2fs/ext2fs.h

Modified: head/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vfsops.c	Fri Feb  8 20:58:00 2013	(r246563)
+++ head/sys/fs/ext2fs/ext2_vfsops.c	Fri Feb  8 21:09:44 2013	(r246564)
@@ -320,8 +320,8 @@ compute_sb_data(struct vnode *devvp, str
 	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;

Modified: head/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- head/sys/fs/ext2fs/ext2fs.h	Fri Feb  8 20:58:00 2013	(r246563)
+++ head/sys/fs/ext2fs/ext2fs.h	Fri Feb  8 21:09:44 2013	(r246564)
@@ -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)