Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c459001fa4f71deafb62e00fa70d35f695498965

Authored by Dmitry Monakhov
Committed by Jan Kara
1 parent c9f937e4a3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ext3: quota macros cleanup [V2] 

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>
Signed-off-by: Jan Kara <jack@suse.cz>

Showing 3 changed files with 13 additions and 10 deletions Side-by-side Diff

... ... @@ -970,7 +970,7 @@
970 970 if (max_blocks > DIO_MAX_BLOCKS)
971 971 max_blocks = DIO_MAX_BLOCKS;
972 972 handle = ext3_journal_start(inode, DIO_CREDITS +
973   - 2 * EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb));
  973 + EXT3_MAXQUOTAS_TRANS_BLOCKS(inode->i_sb));
974 974 if (IS_ERR(handle)) {
975 975 ret = PTR_ERR(handle);
976 976 goto out;
... ... @@ -3146,8 +3146,8 @@
3146 3146  
3147 3147 /* (user+group)*(old+new) structure, inode write (sb,
3148 3148 * inode block, ? - but truncate inode update has it) */
3149   - handle = ext3_journal_start(inode, 2*(EXT3_QUOTA_INIT_BLOCKS(inode->i_sb)+
3150   - EXT3_QUOTA_DEL_BLOCKS(inode->i_sb))+3);
  3149 + handle = ext3_journal_start(inode, EXT3_MAXQUOTAS_INIT_BLOCKS(inode->i_sb)+
  3150 + EXT3_MAXQUOTAS_DEL_BLOCKS(inode->i_sb)+3);
3151 3151 if (IS_ERR(handle)) {
3152 3152 error = PTR_ERR(handle);
3153 3153 goto err_out;
... ... @@ -3239,7 +3239,7 @@
3239 3239 #ifdef CONFIG_QUOTA
3240 3240 /* We know that structure was already allocated during vfs_dq_init so
3241 3241 * we will be updating only the data blocks + inodes */
3242   - ret += 2*EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb);
  3242 + ret += EXT3_MAXQUOTAS_TRANS_BLOCKS(inode->i_sb);
3243 3243 #endif
3244 3244  
3245 3245 return ret;
... ... @@ -1699,7 +1699,7 @@
1699 1699 retry:
1700 1700 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1701 1701 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1702   - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
  1702 + EXT3_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
1703 1703 if (IS_ERR(handle))
1704 1704 return PTR_ERR(handle);
1705 1705  
... ... @@ -1733,7 +1733,7 @@
1733 1733 retry:
1734 1734 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1735 1735 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1736   - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
  1736 + EXT3_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
1737 1737 if (IS_ERR(handle))
1738 1738 return PTR_ERR(handle);
1739 1739  
... ... @@ -1769,7 +1769,7 @@
1769 1769 retry:
1770 1770 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
1771 1771 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
1772   - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
  1772 + EXT3_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
1773 1773 if (IS_ERR(handle))
1774 1774 return PTR_ERR(handle);
1775 1775  
... ... @@ -2175,7 +2175,7 @@
2175 2175 retry:
2176 2176 handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
2177 2177 EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5 +
2178   - 2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
  2178 + EXT3_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
2179 2179 if (IS_ERR(handle))
2180 2180 return PTR_ERR(handle);
2181 2181  
include/linux/ext3_jbd.h
Diff comments   View file @ c459001
... ... @@ -44,13 +44,13 @@
44 44  
45 45 #define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \
46 46 EXT3_XATTR_TRANS_BLOCKS - 2 + \
47   - 2*EXT3_QUOTA_TRANS_BLOCKS(sb))
  47 + EXT3_MAXQUOTAS_TRANS_BLOCKS(sb))
48 48  
49 49 /* Delete operations potentially hit one directory's namespace plus an
50 50 * entire inode, plus arbitrary amounts of bitmap/indirection data. Be
51 51 * generous. We can grow the delete transaction later if necessary. */
52 52  
53   -#define EXT3_DELETE_TRANS_BLOCKS(sb) (2 * EXT3_DATA_TRANS_BLOCKS(sb) + 64)
  53 +#define EXT3_DELETE_TRANS_BLOCKS(sb) (EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) + 64)
54 54  
55 55 /* Define an arbitrary limit for the amount of data we will anticipate
56 56 * writing to any given transaction. For unbounded transactions such as
... ... @@ -86,6 +86,9 @@
86 86 #define EXT3_QUOTA_INIT_BLOCKS(sb) 0
87 87 #define EXT3_QUOTA_DEL_BLOCKS(sb) 0
88 88 #endif
  89 +#define EXT3_MAXQUOTAS_TRANS_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_TRANS_BLOCKS(sb))
  90 +#define EXT3_MAXQUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_INIT_BLOCKS(sb))
  91 +#define EXT3_MAXQUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT3_QUOTA_DEL_BLOCKS(sb))
89 92  
90 93 int
91 94 ext3_mark_iloc_dirty(handle_t *handle,