libext2fs: don't use O_DIRECT for files on tmpfs

[tools/e2fsprogs.git] / lib / ext2fs / punch.c

diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c
index 60cd2a3..c704bf3 100644 (file)
--- a/lib/ext2fs/punch.c
+++ b/lib/ext2fs/punch.c
@@ -48,7 +48,7 @@ static int check_zero_block(char *buf, int blocksize)
  */
 static errcode_t ind_punch(ext2_filsys fs, struct ext2_inode *inode,
                           char *block_buf, blk_t *p, int level,
-                          blk_t start, blk_t count, int max)
+                          blk64_t start, blk64_t count, int max)
 {
        errcode_t       retval;
        blk_t           b;
@@ -57,11 +57,11 @@ static errcode_t ind_punch(ext2_filsys fs, struct ext2_inode *inode,
        int             freed = 0;
 
 #ifdef PUNCH_DEBUG
-       printf("Entering ind_punch, level %d, start %u, count %u, "
+       printf("Entering ind_punch, level %d, start %llu, count %llu, "
               "max %d\n", level, start, count, max);
 #endif
-       incr = 1ULL << ((EXT2_BLOCK_SIZE_BITS(fs->super)-2)*level);
-       for (i=0, offset=0; i < max; i++, p++, offset += incr) {
+       incr = 1ULL << ((EXT2_BLOCK_SIZE_BITS(fs->super) - 2) * level);
+       for (i = 0, offset = 0; i < max; i++, p++, offset += incr) {
                if (offset >= start + count)
                        break;
                if (*p == 0 || (offset+incr) <= start)
@@ -101,8 +101,9 @@ static errcode_t ind_punch(ext2_filsys fs, struct ext2_inode *inode,
        return ext2fs_iblk_sub_blocks(fs, inode, freed);
 }
 
+#define BLK_T_MAX ((blk_t)~0ULL)
 static errcode_t ext2fs_punch_ind(ext2_filsys fs, struct ext2_inode *inode,
-                                 char *block_buf, blk_t start, blk_t count)
+                                 char *block_buf, blk64_t start, blk64_t end)
 {
        errcode_t               retval;
        char                    *buf = 0;
@@ -111,6 +112,15 @@ static errcode_t ext2fs_punch_ind(ext2_filsys fs, struct ext2_inode *inode,
        blk_t                   *bp = inode->i_block;
        blk_t                   addr_per_block;
        blk64_t                 max = EXT2_NDIR_BLOCKS;
+       blk_t                   count;
+
+       /* Check start/end don't overflow the 2^32-1 indirect block limit */
+       if (start > BLK_T_MAX)
+               return 0;
+       if (end >= BLK_T_MAX || end - start + 1 >= BLK_T_MAX)
+               count = BLK_T_MAX - start;
+       else
+               count = end - start + 1;
 
        if (!block_buf) {
                retval = ext2fs_get_array(3, fs->blocksize, &buf);
@@ -119,11 +129,11 @@ static errcode_t ext2fs_punch_ind(ext2_filsys fs, struct ext2_inode *inode,
                block_buf = buf;
        }
 
-       addr_per_block = (blk_t) fs->blocksize >> 2;
+       addr_per_block = (blk_t)fs->blocksize >> 2;
 
        for (level = 0; level < 4; level++, max *= (blk64_t)addr_per_block) {
 #ifdef PUNCH_DEBUG
-               printf("Main loop level %d, start %u count %u "
+               printf("Main loop level %d, start %llu count %u "
                       "max %llu num %d\n", level, start, count, max, num);
 #endif
                if (start < max) {
@@ -150,6 +160,7 @@ errout:
                ext2fs_free_mem(&buf);
        return retval;
 }
+#undef BLK_T_MAX
 
 #ifdef PUNCH_DEBUG
 
@@ -221,7 +232,7 @@ static errcode_t punch_extent_blocks(ext2_filsys fs, ext2_ino_t ino,
        }
 
        /* Free whole clusters from the middle of the range. */
-       while (free_count > 0 && free_count >= EXT2FS_CLUSTER_RATIO(fs)) {
+       while (free_count > 0 && free_count >= (unsigned) EXT2FS_CLUSTER_RATIO(fs)) {
                ext2fs_block_alloc_stats2(fs, free_start, -1);
                freed_now++;
                cluster_freed = EXT2FS_CLUSTER_RATIO(fs);
@@ -402,8 +413,12 @@ static errcode_t ext2fs_punch_extent(ext2_filsys fs, ext2_ino_t ino,
                                goto errout;
                        retval = 0;
 
-                       /* Jump forward to the next extent. */
-                       ext2fs_extent_goto(handle, next_lblk);
+                       /*
+                        * Jump forward to the next extent.  If there are
+                        * errors, the ext2fs_extent_get down below will
+                        * capture them for us.
+                        */
+                       (void)ext2fs_extent_goto(handle, next_lblk);
                        op = EXT2_EXTENT_CURRENT;
                }
                if (retval)
@@ -432,7 +447,8 @@ errout:
        
 static errcode_t ext2fs_punch_inline_data(ext2_filsys fs, ext2_ino_t ino,
                                          struct ext2_inode *inode,
-                                         blk64_t start, blk64_t end)
+                                         blk64_t start,
+                                         blk64_t end EXT2FS_ATTR((unused)))
 {
        errcode_t retval;
 
@@ -455,8 +471,8 @@ static errcode_t ext2fs_punch_inline_data(ext2_filsys fs, ext2_ino_t ino,
 }
 
 /*
- * Deallocate all logical blocks starting at start to end, inclusive.
- * If end is ~0, then this is effectively truncate.
+ * Deallocate all logical _blocks_ starting at start to end, inclusive.
+ * If end is ~0ULL, then this is effectively truncate.
  */
 errcode_t ext2fs_punch(ext2_filsys fs, ext2_ino_t ino,
                       struct ext2_inode *inode,
@@ -480,19 +496,14 @@ errcode_t ext2fs_punch(ext2_filsys fs, ext2_ino_t ino,
                return ext2fs_punch_inline_data(fs, ino, inode, start, end);
        else if (inode->i_flags & EXT4_EXTENTS_FL)
                retval = ext2fs_punch_extent(fs, ino, inode, start, end);
-       else {
-               blk_t   count;
-
-               if (start > ~0U)
-                       return 0;
-               if (end > ~0U)
-                       end = ~0U;
-               count = ((end - start + 1) < ~0U) ? (end - start + 1) : ~0U;
-               retval = ext2fs_punch_ind(fs, inode, block_buf, 
-                                         (blk_t) start, count);
-       }
+       else
+               retval = ext2fs_punch_ind(fs, inode, block_buf, start, end);
        if (retval)
                return retval;
 
+#ifdef PUNCH_DEBUG
+       printf("%u: write inode size now %u blocks %u\n",
+               ino, inode->i_size, inode->i_blocks);
+#endif
        return ext2fs_write_inode(fs, ino, inode);
 }