From patchwork Fri Aug 2 09:49:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 264269 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 75ED22C007E for ; Fri, 2 Aug 2013 19:51:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758448Ab3HBJv2 (ORCPT ); Fri, 2 Aug 2013 05:51:28 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:63313 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758319Ab3HBJv1 (ORCPT ); Fri, 2 Aug 2013 05:51:27 -0400 Received: by mail-pd0-f177.google.com with SMTP id u10so482405pdi.8 for ; Fri, 02 Aug 2013 02:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=LFFRWoiPw3CqXolB4nexVw/KSzn0pBWfNJsH8jNJeIE=; b=vv9QzY8glGURF+AKjrLouolNNwr8eXgYkhvLye0JBqz51Gko/JwxJ3kdlT8iuVFATT Gpj5foeWZP5FQqgCFspl+k8sZ0yP/yYvAzhSKLLR4hyInjxtdPdSWGw2C8ouCE5MjaTZ eu5DNnSjK92HCUpbUP/VWmpqqMgx77BVpURrTINl9tNKXz27eHBX72GwbNaYMkKXSS4z 9vejkc7KX+3Cw4vqdIinRAH2248/+LGVylZFPIPbpW0mM80RThlzo91pBCrQfdPgHFGl tMYHkbkJFlFYYi2ShU8sTAl7TbCfT2n4fk1/KEm/b4LTUbqxlwai4GTiRPyV22sB7W5X kg9g== X-Received: by 10.68.50.138 with SMTP id c10mr6820108pbo.136.1375437087167; Fri, 02 Aug 2013 02:51:27 -0700 (PDT) Received: from lz-devel.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPSA id il4sm5912193pbb.36.2013.08.02.02.51.21 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 Aug 2013 02:51:26 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , Zheng Liu Subject: [PATCH v1 18/22] e2fsck: check inline_data in pass2 Date: Fri, 2 Aug 2013 17:49:45 +0800 Message-Id: <1375436989-18948-19-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1375436989-18948-1-git-send-email-wenqing.lz@taobao.com> References: <1375436989-18948-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 Signed-off-by: Theodore Ts'o Signed-off-by: Zheng Liu --- e2fsck/pass2.c | 123 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 95 insertions(+), 28 deletions(-) diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 257589c..7b66099 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -725,6 +725,15 @@ static void salvage_directory(ext2_filsys fs, } } +static int is_last_entry(ext2_filsys fs, ext2_ino_t ino, + unsigned int offset, int csum_size) +{ + if (ext2fs_inode_has_inline_data(fs, ino)) + return (offset < ext2fs_inline_data_get_size(fs, ino)); + else + return (offset < fs->blocksize - csum_size); +} + static int check_dir_block(ext2_filsys fs, struct ext2_db_entry2 *db, void *priv_data) @@ -733,7 +742,7 @@ static int check_dir_block(ext2_filsys fs, #ifdef ENABLE_HTREE struct dx_dirblock_info *dx_db = 0; #endif /* ENABLE_HTREE */ - struct ext2_dir_entry *dirent, *prev; + struct ext2_dir_entry *dirent, *prev, dot, dotdot; ext2_dirhash_t hash; unsigned int offset = 0; int dir_modified = 0; @@ -756,6 +765,8 @@ static int check_dir_block(ext2_filsys fs, int dx_csum_size = 0, de_csum_size = 0; int failed_csum = 0; int is_leaf = 1; + int inline_data = 0; + int filetype = 0; cd = (struct check_dir_struct *) priv_data; buf = cd->buf; @@ -773,6 +784,10 @@ static int check_dir_block(ext2_filsys fs, de_csum_size = sizeof(struct ext2_dir_entry_tail); } + if (EXT2_HAS_INCOMPAT_FEATURE(fs->super, + EXT2_FEATURE_INCOMPAT_FILETYPE)) + filetype = EXT2_FT_DIR << 8; + /* * Make sure the inode is still in use (could have been * deleted in the duplicate/bad blocks pass. @@ -787,7 +802,11 @@ static int check_dir_block(ext2_filsys fs, cd->pctx.dirent = 0; cd->pctx.num = 0; - if (db->blk == 0) { + if (EXT2_HAS_INCOMPAT_FEATURE(fs->super, + EXT4_FEATURE_INCOMPAT_INLINE_DATA)) + inline_data = ext2fs_inode_has_inline_data(fs, ino); + + if (db->blk == 0 && !inline_data) { if (allocate_dir_block(ctx, db, buf, &cd->pctx)) return 0; block_nr = db->blk; @@ -808,7 +827,11 @@ static int check_dir_block(ext2_filsys fs, #endif ehandler_operation(_("reading directory block")); - cd->pctx.errcode = ext2fs_read_dir_block4(fs, block_nr, buf, 0, ino); + if (inline_data) + cd->pctx.errcode = ext2fs_read_inline_data(fs, ino, buf); + else + cd->pctx.errcode = ext2fs_read_dir_block4(fs, block_nr, + buf, 0, ino); ehandler_operation(0); if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED) cd->pctx.errcode = 0; /* We'll handle this ourselves */ @@ -879,7 +902,7 @@ out_htree: #endif /* ENABLE_HTREE */ /* Verify checksum. */ - if (is_leaf && de_csum_size) { + if (is_leaf && de_csum_size && !inline_data) { /* No space for csum? Rebuild dirs in pass 3A. */ if (!ext2fs_dirent_has_tail(fs, (struct ext2_dir_entry *)buf)) { de_csum_size = 0; @@ -917,20 +940,44 @@ skip_checksum: ext2_ino_t first_unused_inode; problem = 0; - dirent = (struct ext2_dir_entry *) (buf + offset); - (void) ext2fs_get_rec_len(fs, dirent, &rec_len); - cd->pctx.dirent = dirent; - cd->pctx.num = offset; - if (((offset + rec_len) > fs->blocksize) || - (rec_len < 12) || - ((rec_len % 4) != 0) || - (((dirent->name_len & (unsigned) 0xFF)+8) > rec_len)) { - if (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) { - salvage_directory(fs, dirent, prev, &offset); - dir_modified++; - continue; - } else - goto abort_free_dict; + if (!inline_data || dot_state > 1) { + dirent = (struct ext2_dir_entry *) (buf + offset); + (void) ext2fs_get_rec_len(fs, dirent, &rec_len); + cd->pctx.dirent = dirent; + cd->pctx.num = offset; + if (((offset + rec_len) > fs->blocksize) || + (rec_len < 12) || + ((rec_len % 4) != 0) || + (((dirent->name_len & (unsigned) 0xFF)+8) > rec_len)) { + if (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) { + salvage_directory(fs, dirent, prev, &offset); + dir_modified++; + continue; + } else + goto abort_free_dict; + } + } else { + if (dot_state == 0) { + memset(&dot, 0, sizeof(dot)); + dirent = ˙ + dirent->inode = ino; + dirent->rec_len = EXT2_DIR_REC_LEN(1); + dirent->name_len = 1 | filetype; + dirent->name[0] = '.'; + } else if (dot_state == 1) { + memset(&dotdot, 0, sizeof(dotdot)); + dirent = &dotdot; + dirent->inode = + ((struct ext2_dir_entry *)buf)->inode; + dirent->rec_len = EXT2_DIR_REC_LEN(2); + dirent->name_len = 2 | filetype; + dirent->name[0] = '.'; + dirent->name[1] = '.'; + } else { + fatal_error(ctx, _("Can not continue.")); + } + cd->pctx.dirent = dirent; + cd->pctx.num = offset; } if (dot_state == 0) { @@ -1171,9 +1218,14 @@ skip_checksum: prev = dirent; if (dir_modified) (void) ext2fs_get_rec_len(fs, dirent, &rec_len); - offset += rec_len; + if (!inline_data || dot_state > 1) { + offset += rec_len; + } else { + if (dot_state == 1) + offset = 4; + } dot_state++; - } while (offset < fs->blocksize - de_csum_size); + } while (is_last_entry(fs, ino, offset, de_csum_size)); #if 0 printf("\n"); #endif @@ -1191,12 +1243,23 @@ skip_checksum: } #endif /* ENABLE_HTREE */ - if (offset != fs->blocksize - de_csum_size) { - cd->pctx.num = rec_len - (fs->blocksize - de_csum_size) + - offset; - if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { - dirent->rec_len = cd->pctx.num; - dir_modified++; + if (inline_data) { + if (offset != ext2fs_inline_data_get_size(fs, ino)) { + cd->pctx.num = rec_len + offset - + ext2fs_inline_data_get_size(fs, ino); + if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { + dirent->rec_len = cd->pctx.num; + dir_modified++; + } + } + } else { + if (offset != fs->blocksize - de_csum_size) { + cd->pctx.num = rec_len - (fs->blocksize - de_csum_size) + + offset; + if (fix_problem(ctx, PR_2_FINAL_RECLEN, &cd->pctx)) { + dirent->rec_len = cd->pctx.num; + dir_modified++; + } } } if (dir_modified) { @@ -1210,8 +1273,12 @@ skip_checksum: write_and_fix: if (e2fsck_dir_will_be_rehashed(ctx, ino)) ctx->fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; - cd->pctx.errcode = ext2fs_write_dir_block4(fs, block_nr, buf, - 0, ino); + if (inline_data) + cd->pctx.errcode = ext2fs_write_inline_data(fs, ino, + buf); + else + cd->pctx.errcode = ext2fs_write_dir_block4(fs, block_nr, + buf, 0, ino); if (e2fsck_dir_will_be_rehashed(ctx, ino)) ctx->fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS; if (cd->pctx.errcode) {