ext3: kill 2 useless magic numbers
PATCH 1/2 ext3: kill 2 useless magic numbers
dx_root_limit() will never return 20, and I can't figure out what 20 stands for. This function has never changed since htree directory indexing was merged.
Similar for dx_node_limit() and the magic 22.
--- fs/ext3/namei.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ext3/namei.c +2 -2
@@ -240,13 +240,13 @@ static inline unsigned dx_root_limit (struct inode *dir, unsigned infosize) {unsigned entry_space = dir->i_sb->s_blocksize -EXT3_DIR_REC_LEN (1 ) -EXT3_DIR_REC_LEN (2 ) - infosize; -return 0 ?20 : entry_space /sizeof (struct dx_entry ); +return entry_space /sizeof (struct dx_entry ); }static inline unsigned dx_node_limit (struct inode *dir) {unsigned entry_space = dir->i_sb->s_blocksize -EXT3_DIR_REC_LEN (0 ); -return 0 ?22 : entry_space /sizeof (struct dx_entry ); +return entry_space /sizeof (struct dx_entry ); }/*
Signature · 1 line
1.5.4.rc3
Quoted 5 lines · Li Zefan
dx_root_limit()will never return 20, and I can't figure out what 20 stands for. This function has never changed since htree directory indexing was merged.Similar for
dx_node_limit()and the magic 22.
This was for testing htree split code more aggressively, but can be removed.
Quoted 32 lines
Signed-off-by Li Zefan <[email protected]>--- fs/ext3/namei.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/ext3/namei.c +2
-2@@ -240,13 +240,13 @@ static inline unsigned dx_root_limit (struct inode *dir, unsigned infosize) {unsigned entry_space = dir->i_sb->s_blocksize -EXT3_DIR_REC_LEN (1 ) -EXT3_DIR_REC_LEN (2 ) - infosize; -return 0 ?20 : entry_space /sizeof (struct dx_entry ); +return entry_space /sizeof (struct dx_entry ); }static inline unsigned dx_node_limit (struct inode *dir) {unsigned entry_space = dir->i_sb->s_blocksize -EXT3_DIR_REC_LEN (0 ); -return 0 ?22 : entry_space /sizeof (struct dx_entry ); +return entry_space /sizeof (struct dx_entry ); }/* Signature · 6 lines
1.5.4.rc3 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.
Quoted 11 lines · Andreas Dilger
Quoted 5 lines · Li Zefan
dx_root_limit()will never return 20, and I can't figure out what 20 stands for. This function has never changed since htree directory indexing was merged.Similar for
dx_node_limit()and the magic 22.This was for testing htree split code more aggressively, but can be removed.
Acked-by Andreas Dilger <[email protected]>
I added the ext4 version to the patch queue
Mingming
Quoted 44 lines
Quoted 33 lines
Signed-off-by Li Zefan <[email protected]>--- fs/ext3/namei.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/ext3/namei.c +2
-2@@ -240,13 +240,13 @@ static inline unsigned dx_root_limit (struct inode *dir, unsigned infosize) {unsigned entry_space = dir->i_sb->s_blocksize -EXT3_DIR_REC_LEN (1 ) -EXT3_DIR_REC_LEN (2 ) - infosize; -return 0 ?20 : entry_space /sizeof (struct dx_entry ); +return entry_space /sizeof (struct dx_entry ); }static inline unsigned dx_node_limit (struct inode *dir) {unsigned entry_space = dir->i_sb->s_blocksize -EXT3_DIR_REC_LEN (0 ); -return 0 ?22 : entry_space /sizeof (struct dx_entry ); +return entry_space /sizeof (struct dx_entry ); }/* Signature · 6 lines
1.5.4.rc3 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.htmlCheers, Andreas
--
Andreas Dilger
Sr. Staff Engineer, Lustre Group
Sun Microsystems of Canada, Inc.--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html