libext2fs: force DIO alignment FreeBSD when operating on a block device

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

diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c
index 14eaed3..810a7fd 100644 (file)
--- a/lib/ext2fs/fileio.c
+++ b/lib/ext2fs/fileio.c
@@ -123,6 +123,8 @@ errcode_t ext2fs_file_flush(ext2_file_t file)
 {
        errcode_t       retval;
        ext2_filsys fs;
+       int             ret_flags;
+       blk64_t         dontcare;
 
        EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
        fs = file->fs;
@@ -131,6 +133,22 @@ errcode_t ext2fs_file_flush(ext2_file_t file)
            !(file->flags & EXT2_FILE_BUF_DIRTY))
                return 0;
 
+       /* Is this an uninit block? */
+       if (file->physblock && file->inode.i_flags & EXT4_EXTENTS_FL) {
+               retval = ext2fs_bmap2(fs, file->ino, &file->inode, BMAP_BUFFER,
+                                     0, file->blockno, &ret_flags, &dontcare);
+               if (retval)
+                       return retval;
+               if (ret_flags & BMAP_RET_UNINIT) {
+                       retval = ext2fs_bmap2(fs, file->ino, &file->inode,
+                                             BMAP_BUFFER, BMAP_SET,
+                                             file->blockno, 0,
+                                             &file->physblock);
+                       if (retval)
+                               return retval;
+               }
+       }
+
        /*
         * OK, the physical block hasn't been allocated yet.
         * Allocate it.
@@ -185,15 +203,17 @@ static errcode_t load_buffer(ext2_file_t file, int dontfill)
 {
        ext2_filsys     fs = file->fs;
        errcode_t       retval;
+       int             ret_flags;
 
        if (!(file->flags & EXT2_FILE_BUF_VALID)) {
                retval = ext2fs_bmap2(fs, file->ino, &file->inode,
-                                    BMAP_BUFFER, 0, file->blockno, 0,
+                                    BMAP_BUFFER, 0, file->blockno, &ret_flags,
                                     &file->physblock);
                if (retval)
                        return retval;
                if (!dontfill) {
-                       if (file->physblock) {
+                       if (file->physblock &&
+                           !(ret_flags & BMAP_RET_UNINIT)) {
                                retval = io_channel_read_blk64(fs->io,
                                                               file->physblock,
                                                               1, file->buf);
@@ -247,7 +267,7 @@ ext2fs_file_read_inline_data(ext2_file_t file, void *buf,
                count = wanted;
        memcpy(buf, file->buf + file->pos, count);
        file->pos += count;
-       buf += count;
+       buf = (char *) buf + count;
 
 out:
        if (got)
@@ -464,7 +484,7 @@ errcode_t ext2fs_file_llseek(ext2_file_t file, __u64 offset,
 errcode_t ext2fs_file_lseek(ext2_file_t file, ext2_off_t offset,
                            int whence, ext2_off_t *ret_pos)
 {
-       __u64           loffset, ret_loffset;
+       __u64           loffset, ret_loffset = 0;
        errcode_t       retval;
 
        loffset = offset;
@@ -568,20 +588,10 @@ errcode_t ext2fs_file_set_size2(ext2_file_t file, ext2_off64_t size)
        old_truncate = ((old_size + file->fs->blocksize - 1) >>
                      EXT2_BLOCK_SIZE_BITS(file->fs->super));
 
-       /* If we're writing a large file, set the large_file flag */
-       if (LINUX_S_ISREG(file->inode.i_mode) &&
-           ext2fs_needs_large_file_feature(EXT2_I_SIZE(&file->inode)) &&
-           (!EXT2_HAS_RO_COMPAT_FEATURE(file->fs->super,
-                                        EXT2_FEATURE_RO_COMPAT_LARGE_FILE) ||
-            file->fs->super->s_rev_level == EXT2_GOOD_OLD_REV)) {
-               file->fs->super->s_feature_ro_compat |=
-                               EXT2_FEATURE_RO_COMPAT_LARGE_FILE;
-               ext2fs_update_dynamic_rev(file->fs);
-               ext2fs_mark_super_dirty(file->fs);
-       }
+       retval = ext2fs_inode_size_set(file->fs, &file->inode, size);
+       if (retval)
+               return retval;
 
-       file->inode.i_size = size & 0xffffffff;
-       file->inode.i_size_high = (size >> 32);
        if (file->ino) {
                retval = ext2fs_write_inode(file->fs, file->ino, &file->inode);
                if (retval)