summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-05-06 16:36:50 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-06 16:36:51 -0700
commit16052ec56a0836db7de51d6ea4173c6b53f0a9b9 (patch)
tree2a0c77ea771c44279310fcfd203761a261a0e5c6
parent8f9b41d95594af0bdafd4f3c22e9e1968ac7342c (diff)
parent82c18e022db437b22c0d76cca420bfe558bf2ebb (diff)
downloadextras-16052ec56a0836db7de51d6ea4173c6b53f0a9b9.tar.gz
Merge "ext4_utils: Fix long symbolic links"
-rw-r--r--ext4_utils/indirect.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ext4_utils/indirect.c b/ext4_utils/indirect.c
index 4e768a16..70f04d6e 100644
--- a/ext4_utils/indirect.c
+++ b/ext4_utils/indirect.c
@@ -484,9 +484,10 @@ u8 *inode_allocate_data_indirect(struct ext4_inode *inode, unsigned long len,
unsigned long backing_len)
{
struct block_allocation *alloc;
+ u32 block_len = DIV_ROUND_UP(len, info.block_size);
u8 *data = NULL;
- alloc = do_inode_allocate_indirect(inode, len);
+ alloc = do_inode_allocate_indirect(inode, block_len);
if (alloc == NULL) {
error("failed to allocate extents for %lu bytes", len);
return NULL;
@@ -498,6 +499,10 @@ u8 *inode_allocate_data_indirect(struct ext4_inode *inode, unsigned long len,
error("failed to create backing for %lu bytes", backing_len);
}
+ rewind_alloc(alloc);
+ if (do_inode_attach_indirect(inode, alloc, block_len))
+ error("failed to attach blocks to indirect inode");
+
free_alloc(alloc);
return data;