Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 42986
b: refs/heads/master
c: 7e02897
h: refs/heads/master
v: v3
  • Loading branch information
Avantika Mathur authored and Linus Torvalds committed Dec 7, 2006
1 parent bc7c7dd commit a8ae144
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7d1c520bb57e4b5e94ec937c13553dccf473341b
refs/heads/master: 7e0289766a0750a56260565bd3b74eb544483d45
63 changes: 42 additions & 21 deletions trunk/fs/ext4/extents.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ static ext4_fsblk_t ext4_ext_find_goal(struct inode *inode,
depth = path->p_depth;

/* try to predict block placement */
if ((ex = path[depth].p_ext))
ex = path[depth].p_ext;
if (ex)
return ext_pblock(ex)+(block-le32_to_cpu(ex->ee_block));

/* it looks like index is empty;
Expand Down Expand Up @@ -543,7 +544,8 @@ static int ext4_ext_insert_index(handle_t *handle, struct inode *inode,
struct ext4_extent_idx *ix;
int len, err;

if ((err = ext4_ext_get_access(handle, inode, curp)))
err = ext4_ext_get_access(handle, inode, curp);
if (err)
return err;

BUG_ON(logical == le32_to_cpu(curp->p_idx->ei_block));
Expand Down Expand Up @@ -665,7 +667,8 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
}
lock_buffer(bh);

if ((err = ext4_journal_get_create_access(handle, bh)))
err = ext4_journal_get_create_access(handle, bh);
if (err)
goto cleanup;

neh = ext_block_hdr(bh);
Expand Down Expand Up @@ -702,18 +705,21 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
set_buffer_uptodate(bh);
unlock_buffer(bh);

if ((err = ext4_journal_dirty_metadata(handle, bh)))
err = ext4_journal_dirty_metadata(handle, bh);
if (err)
goto cleanup;
brelse(bh);
bh = NULL;

/* correct old leaf */
if (m) {
if ((err = ext4_ext_get_access(handle, inode, path + depth)))
err = ext4_ext_get_access(handle, inode, path + depth);
if (err)
goto cleanup;
path[depth].p_hdr->eh_entries =
cpu_to_le16(le16_to_cpu(path[depth].p_hdr->eh_entries)-m);
if ((err = ext4_ext_dirty(handle, inode, path + depth)))
err = ext4_ext_dirty(handle, inode, path + depth);
if (err)
goto cleanup;

}
Expand All @@ -736,7 +742,8 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
}
lock_buffer(bh);

if ((err = ext4_journal_get_create_access(handle, bh)))
err = ext4_journal_get_create_access(handle, bh);
if (err)
goto cleanup;

neh = ext_block_hdr(bh);
Expand Down Expand Up @@ -780,7 +787,8 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
set_buffer_uptodate(bh);
unlock_buffer(bh);

if ((err = ext4_journal_dirty_metadata(handle, bh)))
err = ext4_journal_dirty_metadata(handle, bh);
if (err)
goto cleanup;
brelse(bh);
bh = NULL;
Expand Down Expand Up @@ -854,7 +862,8 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
}
lock_buffer(bh);

if ((err = ext4_journal_get_create_access(handle, bh))) {
err = ext4_journal_get_create_access(handle, bh);
if (err) {
unlock_buffer(bh);
goto out;
}
Expand All @@ -874,11 +883,13 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
set_buffer_uptodate(bh);
unlock_buffer(bh);

if ((err = ext4_journal_dirty_metadata(handle, bh)))
err = ext4_journal_dirty_metadata(handle, bh);
if (err)
goto out;

/* create index in new top-level index: num,max,pointer */
if ((err = ext4_ext_get_access(handle, inode, curp)))
err = ext4_ext_get_access(handle, inode, curp);
if (err)
goto out;

curp->p_hdr->eh_magic = EXT4_EXT_MAGIC;
Expand Down Expand Up @@ -1070,20 +1081,24 @@ int ext4_ext_correct_indexes(handle_t *handle, struct inode *inode,
*/
k = depth - 1;
border = path[depth].p_ext->ee_block;
if ((err = ext4_ext_get_access(handle, inode, path + k)))
err = ext4_ext_get_access(handle, inode, path + k);
if (err)
return err;
path[k].p_idx->ei_block = border;
if ((err = ext4_ext_dirty(handle, inode, path + k)))
err = ext4_ext_dirty(handle, inode, path + k);
if (err)
return err;

while (k--) {
/* change all left-side indexes */
if (path[k+1].p_idx != EXT_FIRST_INDEX(path[k+1].p_hdr))
break;
if ((err = ext4_ext_get_access(handle, inode, path + k)))
err = ext4_ext_get_access(handle, inode, path + k);
if (err)
break;
path[k].p_idx->ei_block = border;
if ((err = ext4_ext_dirty(handle, inode, path + k)))
err = ext4_ext_dirty(handle, inode, path + k);
if (err)
break;
}

Expand Down Expand Up @@ -1142,7 +1157,8 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
le16_to_cpu(newext->ee_len),
le32_to_cpu(ex->ee_block),
le16_to_cpu(ex->ee_len), ext_pblock(ex));
if ((err = ext4_ext_get_access(handle, inode, path + depth)))
err = ext4_ext_get_access(handle, inode, path + depth);
if (err)
return err;
ex->ee_len = cpu_to_le16(le16_to_cpu(ex->ee_len)
+ le16_to_cpu(newext->ee_len));
Expand Down Expand Up @@ -1192,7 +1208,8 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
has_space:
nearex = path[depth].p_ext;

if ((err = ext4_ext_get_access(handle, inode, path + depth)))
err = ext4_ext_get_access(handle, inode, path + depth);
if (err)
goto cleanup;

if (!nearex) {
Expand Down Expand Up @@ -1486,10 +1503,12 @@ int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
path--;
leaf = idx_pblock(path->p_idx);
BUG_ON(path->p_hdr->eh_entries == 0);
if ((err = ext4_ext_get_access(handle, inode, path)))
err = ext4_ext_get_access(handle, inode, path);
if (err)
return err;
path->p_hdr->eh_entries = cpu_to_le16(le16_to_cpu(path->p_hdr->eh_entries)-1);
if ((err = ext4_ext_dirty(handle, inode, path)))
err = ext4_ext_dirty(handle, inode, path);
if (err)
return err;
ext_debug("index is empty, remove it, free block %llu\n", leaf);
bh = sb_find_get_block(inode->i_sb, leaf);
Expand Down Expand Up @@ -1930,7 +1949,8 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode,
mutex_lock(&EXT4_I(inode)->truncate_mutex);

/* check in cache */
if ((goal = ext4_ext_in_cache(inode, iblock, &newex))) {
goal = ext4_ext_in_cache(inode, iblock, &newex);
if (goal) {
if (goal == EXT4_EXT_CACHE_GAP) {
if (!create) {
/* block isn't allocated yet and
Expand Down Expand Up @@ -1969,7 +1989,8 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode,
*/
BUG_ON(path[depth].p_ext == NULL && depth != 0);

if ((ex = path[depth].p_ext)) {
ex = path[depth].p_ext;
if (ex) {
unsigned long ee_block = le32_to_cpu(ex->ee_block);
ext4_fsblk_t ee_start = ext_pblock(ex);
unsigned short ee_len = le16_to_cpu(ex->ee_len);
Expand Down

0 comments on commit a8ae144

Please sign in to comment.