ext4: move quota initialization out of inode allocation transaction

Inode allocation transaction is pretty heavy (246 credits with quotas
and extents before previous patch, still around 200 after it).  This is
mostly due to credits required for allocation of quota structures
(credits there are heavily overestimated but it's difficult to make
better estimates if we don't want to wire non-trivial assumptions about
quota format into filesystem).

So move quota initialization out of allocation transaction. That way
transaction for quota structure allocation will be started only if we
need to look up quota structure on disk (rare) and furthermore it will
be started for each quota type separately, not for all of them at once.
This reduces maximum transaction size to 34 is most cases and to 73 in
the worst case.

[ Modified by tytso to clean up the cleanup paths for error handling.
  Also use a separate call to ext4_std_error() for each failure so it
  is easier for someone who is debugging a problem in this function to
  determine which function call failed. ]

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 4 insertions, 8 deletions

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 45a5ca89797f..955c907fc980 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2252,8 +2252,7 @@ static int ext4_create(struct inode *dir, struct dentry *dentry, umode_t mode,
         dquot_initialize(dir);
 
         credits = (EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
-                   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
-                   EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
+                   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3);
 retry:
         inode = ext4_new_inode_start_handle(dir, mode, &dentry->d_name, 0,
                                             NULL, EXT4_HT_DIR, credits);
@@ -2287,8 +2286,7 @@ static int ext4_mknod(struct inode *dir, struct dentry *dentry,
         dquot_initialize(dir);
 
         credits = (EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
-                   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
-                   EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
+                   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3);
 retry:
         inode = ext4_new_inode_start_handle(dir, mode, &dentry->d_name, 0,
                                             NULL, EXT4_HT_DIR, credits);
@@ -2397,8 +2395,7 @@ static int ext4_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
         dquot_initialize(dir);
 
         credits = (EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
-                   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
-                   EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
+                   EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3);
 retry:
         inode = ext4_new_inode_start_handle(dir, S_IFDIR | mode,
                                             &dentry->d_name,
@@ -2827,8 +2824,7 @@ static int ext4_symlink(struct inode *dir,
                  * quota blocks, sb is already counted in previous macros).
                  */
                 credits = EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
-                          EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
-                          EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb);
+                          EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3;
         }
 retry:
         inode = ext4_new_inode_start_handle(dir, S_IFLNK|S_IRWXUGO,