diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-11-29 00:08:54 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-11-29 01:03:04 -0500 |
| commit | 9c9e1d5fe507d08309e9815eee50ca73e21bd2bd (patch) | |
| tree | a296b81b4ff217230d582173f80e5efcc3a627fd | |
| parent | 4607ef7d53304c00f6259ab671e597d5493b9786 (diff) | |
| download | e2fsprogs-9c9e1d5fe507d08309e9815eee50ca73e21bd2bd.tar.gz | |
libext2fs: Fix SET_BMAP bugs in ext2fs_bmap() and ext2fs_bmap2()
Don't byte-swap the block number when setting i_block[x], since the
write_inode function will take of byte swapping the inode.
The phys_blk parameter contains an input parameter in the SET_BMAP
case, so it must be passed to ext2fs_bmap2() from the legacy function
ext2fs_bmap().
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | lib/ext2fs/bmap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c index 2a864395..933036b1 100644 --- a/lib/ext2fs/bmap.c +++ b/lib/ext2fs/bmap.c @@ -214,9 +214,6 @@ errcode_t ext2fs_bmap2(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode, if (block < EXT2_NDIR_BLOCKS) { if (bmap_flags & BMAP_SET) { b = *phys_blk; -#ifdef WORDS_BIGENDIAN - b = ext2fs_swab32(b); -#endif inode_bmap(inode, block) = b; inode_dirty++; goto done; @@ -325,7 +322,7 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode, blk_t *phys_blk) { errcode_t ret; - blk64_t ret_blk; + blk64_t ret_blk = *phys_blk; ret = ext2fs_bmap2(fs, ino, inode, block_buf, bmap_flags, block, 0, &ret_blk); |