diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 23:44:47 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 23:44:47 -0400 |
| commit | a107e5a3a473a2ea62bd5af24e11b84adf1486ff (patch) | |
| tree | d36c2cb38d8be88d4d75cdebc354aa140aa0e470 /fs/ext4/migrate.c | |
| parent | e3e1288e86a07cdeb0aee5860a2dff111c6eff79 (diff) | |
| parent | a269029d0e2192046be4c07ed78a45022469ee4c (diff) | |
Merge branch 'next' into upstream-merge
Conflicts:
fs/ext4/inode.c
fs/ext4/mballoc.c
include/trace/events/ext4.h
Diffstat (limited to 'fs/ext4/migrate.c')
| -rw-r--r-- | fs/ext4/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index 1765c2c50a9b..25f3a974b725 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c | |||
| @@ -412,7 +412,7 @@ static int free_ext_idx(handle_t *handle, struct inode *inode, | |||
| 412 | struct buffer_head *bh; | 412 | struct buffer_head *bh; |
| 413 | struct ext4_extent_header *eh; | 413 | struct ext4_extent_header *eh; |
| 414 | 414 | ||
| 415 | block = idx_pblock(ix); | 415 | block = ext4_idx_pblock(ix); |
| 416 | bh = sb_bread(inode->i_sb, block); | 416 | bh = sb_bread(inode->i_sb, block); |
| 417 | if (!bh) | 417 | if (!bh) |
| 418 | return -EIO; | 418 | return -EIO; |