Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
index 8c6c685b9d22..5c1e27de7755 100644
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
@@ -43,6 +43,7 @@ static int finish_range(handle_t *handle, struct inode *inode,
 
         if (IS_ERR(path)) {
                 retval = PTR_ERR(path);
+                path = NULL;
                 goto err_out;
         }
 
@@ -74,6 +75,10 @@ static int finish_range(handle_t *handle, struct inode *inode,
         }
         retval = ext4_ext_insert_extent(handle, inode, path, &newext);
 err_out:
+        if (path) {
+                ext4_ext_drop_refs(path);
+                kfree(path);
+        }
         lb->first_pblock = 0;
         return retval;
 }