From patchwork Mon Jan 14 14:18:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 211789 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6D4742C0093 for ; Tue, 15 Jan 2013 01:04:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756440Ab3ANOE7 (ORCPT ); Mon, 14 Jan 2013 09:04:59 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35149 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756283Ab3ANOE6 (ORCPT ); Mon, 14 Jan 2013 09:04:58 -0500 Received: by mail-pa0-f54.google.com with SMTP id bi5so2261576pad.41 for ; Mon, 14 Jan 2013 06:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=SB6plCMFQlZjObKkIXUmPaYzywaxJK+wEcpdFNn7vAo=; b=jM4Ww8mQp1ZdxMF65CjL5idUezp9qSqB0mW3afTH7XjimJNNGGD++p9FxXJAtQN61h UFluV5hIBcc1LEhpfr4Lxd/fXxsasIjJT4iV72fhxizdocE6H1tn4A6oymkLrI4Xj0Us 7yn9HRKsPWkp244hjpuSyNf2aslvYy4pHLpnuI3EYZ7KZEiW/v84ES1WDUAVesuVSis5 uBtf8LlRwAr2fbcCEDjGJdkhPk5jPPje+XPKupFW9tPJzSPw95DQ+2EWDYjnwusLDl30 wwM9jCUfeW3SXQsim8kAzEf9eAZlLxb4EugStBK5bTsB6vJp84oB1yDiVwm8h3qlmC4K 4rsA== X-Received: by 10.66.81.166 with SMTP id b6mr231835988pay.7.1358172297912; Mon, 14 Jan 2013 06:04:57 -0800 (PST) Received: from lz-desktop.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id ue7sm8262341pbc.53.2013.01.14.06.04.53 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 14 Jan 2013 06:04:57 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: "Theodore Ts'o" , Zheng Liu Subject: [PATCH 2/2 v2] debugfs: dump a sparse file Date: Mon, 14 Jan 2013 22:18:31 +0800 Message-Id: <1358173111-10511-2-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: <1358173111-10511-1-git-send-email-wenqing.lz@taobao.com> References: <1358173111-10511-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu When ext2fs_file_open() is called with EXT2_FILE_SPAESE flag, ext2fs_file_read() will return EXT2_ET_READ_HOLE_FOUND if it meets a hole/uninitialized block. CC: "Theodore Ts'o" Signed-off-by: Zheng Liu --- debugfs/dump.c | 44 ++++++++++++++++++++++++++++++++++++-------- lib/ext2fs/ext2_err.et.in | 3 +++ lib/ext2fs/ext2fs.h | 1 + lib/ext2fs/fileio.c | 11 +++++++++-- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/debugfs/dump.c b/debugfs/dump.c index a15a0b7..a34b293 100644 --- a/debugfs/dump.c +++ b/debugfs/dump.c @@ -107,26 +107,54 @@ static void dump_file(const char *cmdname, ext2_ino_t ino, int fd, struct ext2_inode inode; char buf[8192]; ext2_file_t e2_file; - int nbytes; + ext2_off64_t ret_pos; + int nbytes, flags = 0; unsigned int got; if (debugfs_read_inode(ino, &inode, cmdname)) return; - retval = ext2fs_file_open(current_fs, ino, 0, &e2_file); + /* + * we need to handle stdout because this function is called by + * do_cat() and do_dump(). + */ + if (fd != 1) + flags = EXT2_FILE_SPARSE; + retval = ext2fs_file_open(current_fs, ino, flags, &e2_file); if (retval) { com_err(cmdname, retval, "while opening ext2 file"); return; } while (1) { retval = ext2fs_file_read(e2_file, buf, sizeof(buf), &got); - if (retval) + if (retval && retval != EXT2_ET_READ_HOLE_FOUND) com_err(cmdname, retval, "while reading ext2 file"); - if (got == 0) - break; - nbytes = write(fd, buf, got); - if ((unsigned) nbytes != got) - com_err(cmdname, errno, "while writing file"); + if (retval & EXT2_ET_READ_HOLE_FOUND) { + if (got) { + nbytes = write(fd, buf, got); + if ((unsigned) nbytes != got) + com_err(cmdname, errno, + "while writing file"); + } + retval = ext2fs_file_llseek(e2_file, + EXT2_SEEK_OFFSET_INVALID, + EXT2_SEEK_DATA, &ret_pos); + if (retval == EXT2_ET_SEEK_BEYOND_EOF) + break; + if (retval) + com_err(cmdname, retval, + "while lseeking ext2 file"); + ret_pos = lseek64(fd, ret_pos, SEEK_SET); + if (ret_pos < 0) + com_err(cmdname, retval, + "while lseeking target file"); + } else { + if (got == 0) + break; + nbytes = write(fd, buf, got); + if ((unsigned) nbytes != got) + com_err(cmdname, errno, "while writing file"); + } } retval = ext2fs_file_close(e2_file); if (retval) { diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in index f763938..0d6a031 100644 --- a/lib/ext2fs/ext2_err.et.in +++ b/lib/ext2fs/ext2_err.et.in @@ -476,4 +476,7 @@ ec EXT2_ET_MMP_CSUM_INVALID, ec EXT2_ET_SEEK_BEYOND_EOF, "lseek beyond the EOF" +ec EXT2_ET_READ_HOLE_FOUND, + "We read a hole/uninitialized block with EXT2_FILE_SPARSE flag" + end diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 474049f..8aa24b3 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -149,6 +149,7 @@ typedef struct ext2_struct_dblist *ext2_dblist; #define EXT2_FILE_WRITE 0x0001 #define EXT2_FILE_CREATE 0x0002 +#define EXT2_FILE_SPARSE 0x0004 #define EXT2_FILE_MASK 0x00FF diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c index ab33290..6281db7 100644 --- a/lib/ext2fs/fileio.c +++ b/lib/ext2fs/fileio.c @@ -185,11 +185,12 @@ static errcode_t load_buffer(ext2_file_t file, int dontfill) { ext2_filsys fs = file->fs; errcode_t retval; + int ret_flags = 0; if (!(file->flags & EXT2_FILE_BUF_VALID)) { retval = ext2fs_bmap2(fs, file->ino, &file->inode, - BMAP_BUFFER, 0, file->blockno, 0, - &file->physblock); + BMAP_BUFFER, 0, file->blockno, + &ret_flags, &file->physblock); if (retval) return retval; if (!dontfill) { @@ -203,6 +204,12 @@ static errcode_t load_buffer(ext2_file_t file, int dontfill) memset(file->buf, 0, fs->blocksize); } file->flags |= EXT2_FILE_BUF_VALID; + if (file->flags & EXT2_FILE_SPARSE) { + if (file->physblock == 0 || + ret_flags & BMAP_RET_UNINIT) { + return EXT2_ET_READ_HOLE_FOUND; + } + } } return 0; }