From patchwork Tue Jul 31 11:48:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 174245 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 A0ED72C0092 for ; Tue, 31 Jul 2012 21:40:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756040Ab2GaLkm (ORCPT ); Tue, 31 Jul 2012 07:40:42 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:53681 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756028Ab2GaLkk (ORCPT ); Tue, 31 Jul 2012 07:40:40 -0400 Received: by mail-yw0-f46.google.com with SMTP id m54so5916848yhm.19 for ; Tue, 31 Jul 2012 04:40:40 -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=wC5zXMU9wma+0/Y5jFkwFyHLplL5DxtwrfBRhCBy0H4=; b=YDTzdiK+x6QM3/JgkfxTbBo20Dwe3uSxBqJkDrrdU6QCtIv+Ewf5OGNN/ycdVcnq11 ohhpfix+tY7mNWVn1LWfWicJED60878jS4rUqKTttfsjs/yvTybHORC0+pEVJiX7kTjW HC5lSsGUI7nNIUfoTZMdnt0APbGH4ArjFnSlQOaT/ijHjfmumsiLOgowPbLyUHz18F/j iHn9BpX70+1iXPX3Ijb02/FH2a1lwmMWGHeK5SEs8CJL6mKa7bsKc3w7Bg+jvyQmCKji xufMpjNLgssPGHzD8hg0Qf4WPdG/cFBPnUdiByZJB4xpUSFANQ6mC5snjbMFWAwl0PGh xoIQ== Received: by 10.66.74.97 with SMTP id s1mr31761263pav.11.1343734840224; Tue, 31 Jul 2012 04:40:40 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id oo6sm135950pbc.22.2012.07.31.04.40.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 04:40:39 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 29/36 v4] e2fsck: add three problem descriptions in pass1 Date: Tue, 31 Jul 2012 19:48:22 +0800 Message-Id: <1343735309-30579-30-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1343735309-30579-1-git-send-email-wenqing.lz@taobao.com> References: <1343735309-30579-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 In pass1, we will meet three problems. So add descriptions in problem table. Signed-off-by: Zheng Liu --- e2fsck/problem.c | 15 +++++++++++++++ e2fsck/problem.h | 9 +++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 286257d..e55372d 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -1000,6 +1000,21 @@ static struct e2fsck_problem problem_table[] = { "@i %i does not match. "), PROMPT_FIX, 0 }, + /* INLINE_DATA is set and EXT_ATTR is not set */ + { PR_1_INLINE_DATA_AND_EXT_ATTR, + N_("INLINE_DATA is set in @S, but it is missing EXT_ATTR feature\n"), + PROMPT_FIX, 0 }, + + /* Inode has inline data, superblock missing INCOMPAT_INLINE_DATA feature */ + { PR_1_INLINE_DATA_FEATURE, + N_("@i %i is in inline data format, but @S is missing INLINEDATA feature\n"), + PROMPT_CLEAR, PR_PREEN_OK }, + + /* INLINE_DATA_FL flag set on a non-inline-data filesystem */ + { PR_1_INLINE_DATA_SET, + N_("@i %i has INLINE_DATA_FL flag set on @f without inline data support.\n"), + PROMPT_CLEAR, 0 }, + /* Pass 1b errors */ /* Pass 1B: Rescan for duplicate/bad blocks */ diff --git a/e2fsck/problem.h b/e2fsck/problem.h index 5caade4..4ea2b2d 100644 --- a/e2fsck/problem.h +++ b/e2fsck/problem.h @@ -587,6 +587,15 @@ struct problem_context { #define PR_1_EA_BLOCK_ONLY_CSUM_INVALID 0x01006C +/* INLINE_DATA is set and EXT_ATTR is not set */ +#define PR_1_INLINE_DATA_AND_EXT_ATTR 0x01006D + +/* Inode has inline data, superblock missing INCOMPAT_INLINE_DATA feature */ +#define PR_1_INLINE_DATA_FEATURE 0x01006E + +/* INLINE_DATA_FL flag set on a non-inline-data capable filesystem */ +#define PR_1_INLINE_DATA_SET 0x01006F + /* * Pass 1b errors */