From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: tytso@mit.edu, darrick.wong@oracle.com
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH 13/32] libext2fs: file IO routines should handle uninit blocks
Date: Sat, 01 Mar 2014 23:18:01 -0800 [thread overview]
Message-ID: <20140302071801.28217.13063.stgit@birch.djwong.org> (raw)
In-Reply-To: <20140302071639.28217.57302.stgit@birch.djwong.org>
The file IO routines do not handle uninit blocks at all. The read
method should check for the uninit flag and return a buffer of zeroes,
and the write routine should convert unwritten extents.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
lib/ext2fs/fileio.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c
index 5a39c32..607609f 100644
--- 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);
next prev parent reply other threads:[~2014-03-02 7:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-02 7:16 [PATCH 00/32] e2fsprogs patchbomb 2/14 Darrick J. Wong
2014-03-02 7:16 ` [PATCH 01/32] libext2fs: support modifying arbitrary extended attributes (v5) Darrick J. Wong
2014-03-02 7:16 ` [PATCH 02/32] debugfs: create commands to edit extended attributes Darrick J. Wong
2014-03-02 7:16 ` [PATCH 03/32] libext2fs: fix 64bit overflow in ext2fs_block_alloc_stats_range Darrick J. Wong
2014-03-02 7:17 ` [PATCH 04/32] misc: fix header complaints and resource leaks in e2fsprogs Darrick J. Wong
2014-03-02 7:17 ` [PATCH 05/32] libext2fs: fix memory leak when drastically shrinking extent tree depth Darrick J. Wong
2014-03-02 7:17 ` [PATCH 06/32] libext2fs: fix parents when modifying extents Darrick J. Wong
2014-03-02 7:17 ` [PATCH 07/32] e2fsck: fix inline_data flag errors in pass1 Darrick J. Wong
2014-03-02 7:17 ` [PATCH 08/32] e2fsck: print runs of duplicate blocks instead of all of them Darrick J. Wong
2014-03-02 7:17 ` [PATCH 09/32] e2fsck: verify checksums after checking everything else Darrick J. Wong
2014-03-02 7:17 ` [PATCH 10/32] dumpe2fs: add switch to disable checksum verification Darrick J. Wong
2014-03-02 7:17 ` [PATCH 11/32] mke2fs: set block_validity as a default mount option Darrick J. Wong
2014-03-02 7:17 ` [PATCH 12/32] libext2fs: support allocating uninit blocks in bmap2() Darrick J. Wong
2014-03-02 7:18 ` Darrick J. Wong [this message]
2014-03-02 7:18 ` [PATCH 14/32] resize2fs: convert fs to and from 64bit mode Darrick J. Wong
2014-03-02 7:18 ` [PATCH 15/32] resize2fs: when toggling 64bit, don't free in-use bg data clusters Darrick J. Wong
2014-03-02 7:18 ` [PATCH 16/32] resize2fs: adjust reserved_gdt_blocks when changing group descriptor size Darrick J. Wong
2014-03-02 7:18 ` [PATCH 17/32] libext2fs: have UNIX IO manager use pread/pwrite Darrick J. Wong
2014-03-02 7:18 ` [PATCH 18/32] ext2fs: add readahead method to improve scanning Darrick J. Wong
2014-03-02 7:18 ` [PATCH 19/32] libext2fs: allow clients to read-ahead metadata Darrick J. Wong
2014-03-02 7:18 ` [PATCH 20/32] e2fsck: read-ahead metadata during passes 1, 2, and 4 Darrick J. Wong
2014-03-02 7:18 ` [PATCH 21/32] libext2fs: when appending to a file, don't split an index block in equal halves Darrick J. Wong
2014-03-02 7:18 ` [PATCH 22/32] libext2fs: find inode goal when allocating blocks Darrick J. Wong
2014-03-02 7:19 ` [PATCH 23/32] libext2fs: find a range of empty blocks Darrick J. Wong
2014-03-02 7:19 ` [PATCH 24/32] libext2fs: provide a function to set inode size Darrick J. Wong
2014-03-02 7:19 ` [PATCH 25/32] libext2fs: implement fallocate Darrick J. Wong
2014-03-02 7:19 ` [PATCH 27/32] fuse2fs: translate ACL structures Darrick J. Wong
2014-03-02 7:19 ` [PATCH 28/32] fuse2fs: handle 64-bit dates correctly Darrick J. Wong
2014-03-02 7:19 ` [PATCH 29/32] fuse2fs: implement fallocate Darrick J. Wong
2014-03-02 7:19 ` [PATCH 31/32] tests: enable using fuse2fs with metadata checksum test Darrick J. Wong
2014-03-02 7:20 ` [PATCH 32/32] tests: test date handling Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140302071801.28217.13063.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).