| Message ID | 1260254781-18041-1-git-send-email-dmonakhov@openvz.org |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, 2009-12-08 at 09:46 +0300, Dmitry Monakhov wrote: > Currently all quota block reservation macros contains hardcoded "2" > aka MAXQUOTAS value. This is no good because in some places it is not > obvious to understand what does this digit represent. Let's introduce > new macro with self descriptive name. > > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> > --- > fs/ext3/inode.c | 8 ++++---- > fs/ext3/namei.c | 8 ++++---- > include/linux/ext3_jbd.h | 7 +++++-- > 3 files changed, 13 insertions(+), 10 deletions(-) > > diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c > index 354ed3b..1c99eba 100644 > --- a/fs/ext3/inode.c > +++ b/fs/ext3/inode.c > @@ -970,7 +970,7 @@ static int ext3_get_block(struct inode *inode, sector_t iblock, > if (max_blocks > DIO_MAX_BLOCKS) > max_blocks = DIO_MAX_BLOCKS; > handle = ext3_journal_start(inode, DIO_CREDITS + > - 2 * EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb)); > + EXT3_ALL_QUOTAS_TRANS_BLOCKS(inode->i_sb)); > if (IS_ERR(handle)) { > ret = PTR_ERR(handle); > goto out; > @@ -3136,8 +3136,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) > > /* (user+group)*(old+new) structure, inode write (sb, > * inode block, ? - but truncate inode update has it) */ > - handle = ext3_journal_start(inode, 2*(EXT3_QUOTA_INIT_BLOCKS(inode->i_sb)+ > - EXT3_QUOTA_DEL_BLOCKS(inode->i_sb))+3); > + handle = ext3_journal_start(inode, EXT3_ALL_QUOTAS_INIT_BLOCKS(inode->i_sb)+ > + EXT3_QUOTA_DEL_BLOCKS(inode->i_sb)+3); > if (IS_ERR(handle)) { > error = PTR_ERR(handle); > goto err_out; > @@ -3229,7 +3229,7 @@ static int ext3_writepage_trans_blocks(struct inode *inode) > #ifdef CONFIG_QUOTA > /* We know that structure was already allocated during vfs_dq_init so > * we will be updating only the data blocks + inodes */ > - ret += 2*EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb); > + ret += EXT3_ALL_QUOTAS_TRANS_BLOCKS(inode->i_sb); > #endif > > return ret; > diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c > index aad6400..5c1b676 100644 > --- a/fs/ext3/namei.c > +++ b/fs/ext3/namei.c > @@ -1699,7 +1699,7 @@ static int ext3_create (struct inode * dir, struct dentry * dentry, int mode, > retry: > handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + > EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + > - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); > + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); > if (IS_ERR(handle)) > return PTR_ERR(handle); > > @@ -1733,7 +1733,7 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry, > retry: > handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + > EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + > - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); > + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); > if (IS_ERR(handle)) > return PTR_ERR(handle); > > @@ -1769,7 +1769,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode) > retry: > handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + > EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + > - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); > + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); > if (IS_ERR(handle)) > return PTR_ERR(handle); > > @@ -2175,7 +2175,7 @@ static int ext3_symlink (struct inode * dir, > retry: > handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + > EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 + > - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); > + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); > if (IS_ERR(handle)) > return PTR_ERR(handle); > > diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h > index cf82d51..40dd8bd 100644 > --- a/include/linux/ext3_jbd.h > +++ b/include/linux/ext3_jbd.h > @@ -44,13 +44,13 @@ > > #define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \ > EXT3_XATTR_TRANS_BLOCKS - 2 + \ > - 2*EXT3_QUOTA_TRANS_BLOCKS(sb)) > + EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb)) > > /* Delete operations potentially hit one directory's namespace plus an > * entire inode, plus arbitrary amounts of bitmap/indirection data. Be > * generous. We can grow the delete transaction later if necessary. */ > > -#define EXT3_DELETE_TRANS_BLOCKS(sb) (2 * EXT3_DATA_TRANS_BLOCKS(sb) + 64) > +#define EXT3_DELETE_TRANS_BLOCKS(sb) (EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb) + 64) > > /* Define an arbitrary limit for the amount of data we will anticipate > * writing to any given transaction. For unbounded transactions such as > @@ -86,6 +86,9 @@ > #define EXT3_QUOTA_INIT_BLOCKS(sb) 0 > #define EXT3_QUOTA_DEL_BLOCKS(sb) 0 > #endif > +#define EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb)) > +#define EXT3_ALL_QUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb)) > +#define EXT3_ALL_QUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb)) > Any reason not to use the same micro name in the corresponding ext4 micros cleanup patch? > int > ext3_mark_iloc_dirty(handle_t *handle, -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mingming <cmm@us.ibm.com> writes: > On Tue, 2009-12-08 at 09:46 +0300, Dmitry Monakhov wrote: >> Currently all quota block reservation macros contains hardcoded "2" >> aka MAXQUOTAS value. This is no good because in some places it is not >> obvious to understand what does this digit represent. Let's introduce >> new macro with self descriptive name. >> >> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> >> --- >> fs/ext3/inode.c | 8 ++++---- >> fs/ext3/namei.c | 8 ++++---- >> include/linux/ext3_jbd.h | 7 +++++-- >> 3 files changed, 13 insertions(+), 10 deletions(-) >> >> diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c >> index 354ed3b..1c99eba 100644 >> --- a/fs/ext3/inode.c >> +++ b/fs/ext3/inode.c >> @@ -970,7 +970,7 @@ static int ext3_get_block(struct inode *inode, sector_t iblock, >> if (max_blocks > DIO_MAX_BLOCKS) >> max_blocks = DIO_MAX_BLOCKS; >> handle = ext3_journal_start(inode, DIO_CREDITS + >> - 2 * EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb)); >> + EXT3_ALL_QUOTAS_TRANS_BLOCKS(inode->i_sb)); >> if (IS_ERR(handle)) { >> ret = PTR_ERR(handle); >> goto out; >> @@ -3136,8 +3136,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) >> >> /* (user+group)*(old+new) structure, inode write (sb, >> * inode block, ? - but truncate inode update has it) */ >> - handle = ext3_journal_start(inode, 2*(EXT3_QUOTA_INIT_BLOCKS(inode->i_sb)+ >> - EXT3_QUOTA_DEL_BLOCKS(inode->i_sb))+3); >> + handle = ext3_journal_start(inode, EXT3_ALL_QUOTAS_INIT_BLOCKS(inode->i_sb)+ >> + EXT3_QUOTA_DEL_BLOCKS(inode->i_sb)+3); >> if (IS_ERR(handle)) { >> error = PTR_ERR(handle); >> goto err_out; >> @@ -3229,7 +3229,7 @@ static int ext3_writepage_trans_blocks(struct inode *inode) >> #ifdef CONFIG_QUOTA >> /* We know that structure was already allocated during vfs_dq_init so >> * we will be updating only the data blocks + inodes */ >> - ret += 2*EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb); >> + ret += EXT3_ALL_QUOTAS_TRANS_BLOCKS(inode->i_sb); >> #endif >> >> return ret; >> diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c >> index aad6400..5c1b676 100644 >> --- a/fs/ext3/namei.c >> +++ b/fs/ext3/namei.c >> @@ -1699,7 +1699,7 @@ static int ext3_create (struct inode * dir, struct dentry * dentry, int mode, >> retry: >> handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + >> EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + >> - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); >> + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); >> if (IS_ERR(handle)) >> return PTR_ERR(handle); >> >> @@ -1733,7 +1733,7 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry, >> retry: >> handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + >> EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + >> - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); >> + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); >> if (IS_ERR(handle)) >> return PTR_ERR(handle); >> >> @@ -1769,7 +1769,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode) >> retry: >> handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + >> EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + >> - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); >> + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); >> if (IS_ERR(handle)) >> return PTR_ERR(handle); >> >> @@ -2175,7 +2175,7 @@ static int ext3_symlink (struct inode * dir, >> retry: >> handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + >> EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 + >> - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); >> + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); >> if (IS_ERR(handle)) >> return PTR_ERR(handle); >> >> diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h >> index cf82d51..40dd8bd 100644 >> --- a/include/linux/ext3_jbd.h >> +++ b/include/linux/ext3_jbd.h >> @@ -44,13 +44,13 @@ >> >> #define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \ >> EXT3_XATTR_TRANS_BLOCKS - 2 + \ >> - 2*EXT3_QUOTA_TRANS_BLOCKS(sb)) >> + EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb)) >> >> /* Delete operations potentially hit one directory's namespace plus an >> * entire inode, plus arbitrary amounts of bitmap/indirection data. Be >> * generous. We can grow the delete transaction later if necessary. */ >> >> -#define EXT3_DELETE_TRANS_BLOCKS(sb) (2 * EXT3_DATA_TRANS_BLOCKS(sb) + 64) >> +#define EXT3_DELETE_TRANS_BLOCKS(sb) (EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb) + 64) >> >> /* Define an arbitrary limit for the amount of data we will anticipate >> * writing to any given transaction. For unbounded transactions such as >> @@ -86,6 +86,9 @@ >> #define EXT3_QUOTA_INIT_BLOCKS(sb) 0 >> #define EXT3_QUOTA_DEL_BLOCKS(sb) 0 >> #endif >> +#define EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb)) >> +#define EXT3_ALL_QUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb)) >> +#define EXT3_ALL_QUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb)) >> > > Any reason not to use the same micro name in the corresponding ext4 > micros cleanup patch? Oops sorry, initially i've used XXX_ALL_QUOTAS_XXX name and prepared patches for both file systems, but later i've realized that it is not a good name, and change the name to XXX_MAXQUOTAS_XXX for ext4 version, but forgot to make corresponding changes for ext3. Will resend correct version in a minute. >> int >> ext3_mark_iloc_dirty(handle_t *handle, > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> Currently all quota block reservation macros contains hardcoded "2" > aka MAXQUOTAS value. This is no good because in some places it is not > obvious to understand what does this digit represent. Let's introduce > new macro with self descriptive name. > > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Nice cleanup. Queued to my tree. Thanks. Honza
> > Currently all quota block reservation macros contains hardcoded "2" > > aka MAXQUOTAS value. This is no good because in some places it is not > > obvious to understand what does this digit represent. Let's introduce > > new macro with self descriptive name. > > > > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> > Nice cleanup. Queued to my tree. Thanks. Oops, I should read the whole thread before I merge a patch ;) I'm going to have a look at the new version... Honza
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 354ed3b..1c99eba 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -970,7 +970,7 @@ static int ext3_get_block(struct inode *inode, sector_t iblock, if (max_blocks > DIO_MAX_BLOCKS) max_blocks = DIO_MAX_BLOCKS; handle = ext3_journal_start(inode, DIO_CREDITS + - 2 * EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb)); + EXT3_ALL_QUOTAS_TRANS_BLOCKS(inode->i_sb)); if (IS_ERR(handle)) { ret = PTR_ERR(handle); goto out; @@ -3136,8 +3136,8 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) /* (user+group)*(old+new) structure, inode write (sb, * inode block, ? - but truncate inode update has it) */ - handle = ext3_journal_start(inode, 2*(EXT3_QUOTA_INIT_BLOCKS(inode->i_sb)+ - EXT3_QUOTA_DEL_BLOCKS(inode->i_sb))+3); + handle = ext3_journal_start(inode, EXT3_ALL_QUOTAS_INIT_BLOCKS(inode->i_sb)+ + EXT3_QUOTA_DEL_BLOCKS(inode->i_sb)+3); if (IS_ERR(handle)) { error = PTR_ERR(handle); goto err_out; @@ -3229,7 +3229,7 @@ static int ext3_writepage_trans_blocks(struct inode *inode) #ifdef CONFIG_QUOTA /* We know that structure was already allocated during vfs_dq_init so * we will be updating only the data blocks + inodes */ - ret += 2*EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb); + ret += EXT3_ALL_QUOTAS_TRANS_BLOCKS(inode->i_sb); #endif return ret; diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index aad6400..5c1b676 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -1699,7 +1699,7 @@ static int ext3_create (struct inode * dir, struct dentry * dentry, int mode, retry: handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); @@ -1733,7 +1733,7 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry, retry: handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); @@ -1769,7 +1769,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode) retry: handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 + - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); @@ -2175,7 +2175,7 @@ static int ext3_symlink (struct inode * dir, retry: handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 + - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb)); + EXT3_ALL_QUOTAS_INIT_BLOCKS(dir->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h index cf82d51..40dd8bd 100644 --- a/include/linux/ext3_jbd.h +++ b/include/linux/ext3_jbd.h @@ -44,13 +44,13 @@ #define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \ EXT3_XATTR_TRANS_BLOCKS - 2 + \ - 2*EXT3_QUOTA_TRANS_BLOCKS(sb)) + EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb)) /* Delete operations potentially hit one directory's namespace plus an * entire inode, plus arbitrary amounts of bitmap/indirection data. Be * generous. We can grow the delete transaction later if necessary. */ -#define EXT3_DELETE_TRANS_BLOCKS(sb) (2 * EXT3_DATA_TRANS_BLOCKS(sb) + 64) +#define EXT3_DELETE_TRANS_BLOCKS(sb) (EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb) + 64) /* Define an arbitrary limit for the amount of data we will anticipate * writing to any given transaction. For unbounded transactions such as @@ -86,6 +86,9 @@ #define EXT3_QUOTA_INIT_BLOCKS(sb) 0 #define EXT3_QUOTA_DEL_BLOCKS(sb) 0 #endif +#define EXT3_ALL_QUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb)) +#define EXT3_ALL_QUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb)) +#define EXT3_ALL_QUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb)) int ext3_mark_iloc_dirty(handle_t *handle,
Currently all quota block reservation macros contains hardcoded "2" aka MAXQUOTAS value. This is no good because in some places it is not obvious to understand what does this digit represent. Let's introduce new macro with self descriptive name. Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ext3/inode.c | 8 ++++---- fs/ext3/namei.c | 8 ++++---- include/linux/ext3_jbd.h | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-)