2008-06-12 01:19:58

by Li Zefan

Subject: [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.

Signed-off-by: Li Zefan <[email protected]>
---
fs/ext3/namei.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 0b8cf80..d282ea8 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -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);
}

/*
--
1.5.4.rc3

2008-06-12 06:38:52

by Andreas Dilger

Subject: Re: [PATCH 1/2] ext3: kill 2 useless magic numbers

On Jun 12, 2008 09:18 +0800, Li Zefan wrote:
> 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]>

> Signed-off-by: Li Zefan <[email protected]>
> ---
> fs/ext3/namei.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> index 0b8cf80..d282ea8 100644
> --- a/fs/ext3/namei.c
> +++ b/fs/ext3/namei.c
> @@ -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);
> }
>
> /*
> --
> 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.

2008-06-12 23:11:40

by Mingming Cao

Subject: Re: [PATCH 1/2] ext3: kill 2 useless magic numbers

On Thu, 2008-06-12 at 00:38 -0600, Andreas Dilger wrote:
> On Jun 12, 2008 09:18 +0800, Li Zefan wrote:
> > 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
>
> > Signed-off-by: Li Zefan <[email protected]>
> > ---
> > fs/ext3/namei.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> > index 0b8cf80..d282ea8 100644
> > --- a/fs/ext3/namei.c
> > +++ b/fs/ext3/namei.c
> > @@ -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);
> > }
> >
> > /*
> > --
> > 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.
>
> --
> 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