ext4: reset retry counter when ext4_alloc_file_blocks() makes progress

[linux-2.6-block.git] / fs / ext4 / extents.c

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 3960b7ec3ab770e817a92d38a9d42cfe8ec77bca..77c7c8a54da7371adc67e66287e6ddf68745fe2d 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4382,8 +4382,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
 {
        struct inode *inode = file_inode(file);
        handle_t *handle;
-       int ret = 0;
-       int ret2 = 0, ret3 = 0;
+       int ret, ret2 = 0, ret3 = 0;
        int retries = 0;
        int depth = 0;
        struct ext4_map_blocks map;
@@ -4408,7 +4407,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
        depth = ext_depth(inode);
 
 retry:
-       while (ret >= 0 && len) {
+       while (len) {
                /*
                 * Recalculate credits when extent tree depth changes.
                 */
@@ -4430,9 +4429,13 @@ retry:
                                   inode->i_ino, map.m_lblk,
                                   map.m_len, ret);
                        ext4_mark_inode_dirty(handle, inode);
-                       ret2 = ext4_journal_stop(handle);
+                       ext4_journal_stop(handle);
                        break;
                }
+               /*
+                * allow a full retry cycle for any remaining allocations
+                */
+               retries = 0;
                map.m_lblk += ret;
                map.m_len = len = len - ret;
                epos = (loff_t)map.m_lblk << inode->i_blkbits;
@@ -4450,11 +4453,8 @@ retry:
                if (unlikely(ret2))
                        break;
        }
-       if (ret == -ENOSPC &&
-                       ext4_should_retry_alloc(inode->i_sb, &retries)) {
-               ret = 0;
+       if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
                goto retry;
-       }
 
        return ret > 0 ? ret2 : ret;
 }