From 2bd86f6721d62c782ea324a3d7aa5b0476079b95 Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Thu, 8 Nov 2012 14:47:52 -0500 Subject: [PATCH] --- yaml --- r: 344849 b: refs/heads/master c: 37794732467dd998a34bfce19738ad3ef1f37507 h: refs/heads/master i: 344847: 58178d0398911c0ab116f625cc03192cb6962e85 v: v3 --- [refs] | 2 +- trunk/fs/ext4/extents.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4da1a94b462d..959d19aa10d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19b303d8b5a0e8150a4697c01ca03e75a0a17469 +refs/heads/master: 37794732467dd998a34bfce19738ad3ef1f37507 diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c index 7a64c193b2af..dce97de6a409 100644 --- a/trunk/fs/ext4/extents.c +++ b/trunk/fs/ext4/extents.c @@ -3911,7 +3911,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, struct ext4_extent newex, *ex, *ex2; struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); ext4_fsblk_t newblock = 0; - int free_on_err = 0, err = 0, depth, ret; + int free_on_err = 0, err = 0, depth; unsigned int allocated = 0, offset = 0; unsigned int allocated_clusters = 0; struct ext4_allocation_request ar; @@ -4007,10 +4007,10 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, ee_len, ee_start); goto out; } - ret = ext4_ext_handle_uninitialized_extents( + allocated = ext4_ext_handle_uninitialized_extents( handle, inode, map, path, flags, allocated, newblock); - return ret; + goto out3; } } @@ -4284,6 +4284,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, kfree(path); } +out3: trace_ext4_ext_map_blocks_exit(inode, map, err ? err : allocated); return err ? err : allocated;