Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix gcc -Wall warnings in libuuid
[tools/e2fsprogs.git] / lib / ext2fs / bmap.c
diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c
index 754fc49..e56a99a 100644 (file)
--- a/lib/ext2fs/bmap.c
+++ b/lib/ext2fs/bmap.c
@@ -14,6 +14,7 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <errno.h>
 
 #include "ext2_fs.h"
 #include "ext2fs.h"
@@ -51,10 +52,8 @@ static _BMAP_INLINE_ errcode_t block_ind_bmap(ext2_filsys fs, int flags,
 
        if (flags & BMAP_SET) {
                b = *ret_blk;
-#ifdef EXT2FS_ENABLE_SWAPFS
-               if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-                   (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
-                       b = ext2fs_swab32(b);
+#ifdef WORDS_BIGENDIAN
+               b = ext2fs_swab32(b);
 #endif
                ((blk_t *) block_buf)[nr] = b;
                return io_channel_write_blk(fs->io, ind, 1, block_buf);
@@ -62,10 +61,8 @@ static _BMAP_INLINE_ errcode_t block_ind_bmap(ext2_filsys fs, int flags,
 
        b = ((blk_t *) block_buf)[nr];
 
-#ifdef EXT2FS_ENABLE_SWAPFS
-       if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-           (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-               b = ext2fs_swab32(b);
+#ifdef WORDS_BIGENDIAN
+       b = ext2fs_swab32(b);
 #endif
 
        if (!b && (flags & BMAP_ALLOC)) {
@@ -75,13 +72,11 @@ static _BMAP_INLINE_ errcode_t block_ind_bmap(ext2_filsys fs, int flags,
                if (retval)
                        return retval;
 
-#ifdef EXT2FS_ENABLE_SWAPFS
-               if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-                   (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
-                       ((blk_t *) block_buf)[nr] = ext2fs_swab32(b);
-               else
+#ifdef WORDS_BIGENDIAN
+               ((blk_t *) block_buf)[nr] = ext2fs_swab32(b);
+#else
+               ((blk_t *) block_buf)[nr] = b;
 #endif
-                       ((blk_t *) block_buf)[nr] = b;
 
                retval = io_channel_write_blk(fs->io, ind, 1, block_buf);
                if (retval)
@@ -134,13 +129,14 @@ static _BMAP_INLINE_ errcode_t block_tind_bmap(ext2_filsys fs, int flags,
        return retval;
 }
 
-errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
-                     char *block_buf, int bmap_flags, blk_t block,
-                     blk_t *phys_blk)
+errcode_t ext2fs_bmap2(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
+                      char *block_buf, int bmap_flags, blk64_t block,
+                      int *ret_flags, blk64_t *phys_blk)
 {
        struct ext2_inode inode_buf;
+       ext2_extent_handle_t handle = 0;
        blk_t addr_per_block;
-       blk_t   b;
+       blk_t   b, blk32;
        char    *buf = 0;
        errcode_t       retval = 0;
        int             blocks_alloc = 0, inode_dirty = 0;
@@ -148,6 +144,9 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
        if (!(bmap_flags & BMAP_SET))
                *phys_blk = 0;
 
+       if (ret_flags)
+               *ret_flags = 0;
+
        /* Read inode structure if necessary */
        if (!inode) {
                retval = ext2fs_read_inode(fs, ino, &inode_buf);
@@ -157,6 +156,49 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
        }
        addr_per_block = (blk_t) fs->blocksize >> 2;
 
+       if (inode->i_flags & EXT4_EXTENTS_FL) {
+               struct ext2fs_extent    extent;
+               unsigned int            offset;
+
+               retval = ext2fs_extent_open(fs, ino, &handle);
+               if (retval)
+                       goto done;
+               if (bmap_flags & BMAP_SET) {
+                       retval = ext2fs_extent_set_bmap(handle, block,
+                                                       *phys_blk, 0);
+                       goto done;
+               }
+               retval = ext2fs_extent_goto(handle, block);
+               if (retval) {
+                       /* If the extent is not found, return phys_blk = 0 */
+                       if (retval == EXT2_ET_EXTENT_NOT_FOUND)
+                               retval = 0;
+                       goto done;
+               }
+               retval = ext2fs_extent_get(handle, EXT2_EXTENT_CURRENT, &extent);
+               if (retval)
+                       goto done;
+               offset = block - extent.e_lblk;
+               if (block >= extent.e_lblk && (offset <= extent.e_len)) {
+                       *phys_blk = extent.e_pblk + offset;
+                       if (ret_flags && extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT)
+                               *ret_flags |= BMAP_RET_UNINIT;
+               }
+               if ((*phys_blk == 0) && (bmap_flags & BMAP_ALLOC)) {
+                       retval = ext2fs_alloc_block(fs, b, block_buf, &b);
+                       if (retval)
+                               goto done;
+                       retval = ext2fs_extent_set_bmap(handle, block,
+                                                       (blk64_t) b, 0);
+                       if (retval)
+                               goto done;
+                       blocks_alloc++;
+                       *phys_blk = b;
+               }
+               retval = 0;
+               goto done;
+       }
+
        if (!block_buf) {
                retval = ext2fs_get_array(2, fs->blocksize, &buf);
                if (retval)
@@ -167,10 +209,8 @@ errcode_t ext2fs_bmap(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 EXT2FS_ENABLE_SWAPFS
-                       if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-                           (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-                               b = ext2fs_swab32(b);
+#ifdef WORDS_BIGENDIAN
+                       b = ext2fs_swab32(b);
 #endif
                        inode_bmap(inode, block) = b;
                        inode_dirty++;
@@ -193,6 +233,7 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
        
        /* Indirect block */
        block -= EXT2_NDIR_BLOCKS;
+       blk32 = *phys_blk;
        if (block < addr_per_block) {
                b = inode_bmap(inode, EXT2_IND_BLOCK);
                if (!b) {
@@ -210,7 +251,9 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
                        blocks_alloc++;
                }
                retval = block_ind_bmap(fs, bmap_flags, b, block_buf, 
-                                       &blocks_alloc, block, phys_blk);
+                                       &blocks_alloc, block, &blk32);
+               if (retval == 0)
+                       *phys_blk = blk32;
                goto done;
        }
        
@@ -233,7 +276,9 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
                        blocks_alloc++;
                }
                retval = block_dind_bmap(fs, bmap_flags, b, block_buf, 
-                                        &blocks_alloc, block, phys_blk);
+                                        &blocks_alloc, block, &blk32);
+               if (retval == 0)
+                       *phys_blk = blk32;
                goto done;
        }
 
@@ -255,16 +300,34 @@ errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
                blocks_alloc++;
        }
        retval = block_tind_bmap(fs, bmap_flags, b, block_buf, 
-                                &blocks_alloc, block, phys_blk);
+                                &blocks_alloc, block, &blk32);
+       if (retval == 0)
+               *phys_blk = blk32;
 done:
        if (buf)
                ext2fs_free_mem(&buf);
+       if (handle)
+               ext2fs_extent_free(handle);
        if ((retval == 0) && (blocks_alloc || inode_dirty)) {
-               inode->i_blocks += (blocks_alloc * fs->blocksize) / 512;
+               ext2fs_iblk_add_blocks(fs, inode, blocks_alloc);
                retval = ext2fs_write_inode(fs, ino, inode);
        }
        return retval;
 }
 
-
-
+errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
+                     char *block_buf, int bmap_flags, blk_t block,
+                     blk_t *phys_blk)
+{
+       errcode_t ret;
+       blk64_t ret_blk;
+
+       ret = ext2fs_bmap2(fs, ino, inode, block_buf, bmap_flags, block,
+                           0, &ret_blk);
+       if (ret)
+               return ret;
+       if (ret_blk >= ((long long) 1 << 32))
+               return EOVERFLOW;
+       *phys_blk = ret_blk;
+       return 0;
+}
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git