From patchwork Mon Apr 16 11:39:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 152786 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 9003DB7003 for ; Mon, 16 Apr 2012 21:33:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753134Ab2DPLd4 (ORCPT ); Mon, 16 Apr 2012 07:33:56 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:43674 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752752Ab2DPLdz (ORCPT ); Mon, 16 Apr 2012 07:33:55 -0400 Received: by mail-pb0-f46.google.com with SMTP id un15so6233785pbc.19 for ; Mon, 16 Apr 2012 04:33:55 -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=QPjgUhIFPiMRpRKXCLguVkm5EWu1RL6k2Q1IAU1TZeU=; b=kT57UBIfhO5IA0Yu5fCMwWyYYzfLgXBJjYk66tHmslga/J0r+YRrsvlpfmmjO5CSvQ mYrlhcLyVoaRgfCf+9TEYSfdQV/cEMkuDSLOc/wjd2efvEjAh6kwUM8onS01cZrIlhMG 0skNpAOz9UNthPoIIRDrA++ya/V6fzgm6wwceVywD9IYHBrRWYX5pmRO4LaHYbTE4Dac P00Zeeu1sTT2qnVoMGW5CwIVC9OEIIVALA2l9ukkCx2sTdYC9T+e6ZvcWB91r28jAOit MwOgfG8lZbczZgbScrQualuYNlyA/oQweJdOS9tJ1vH4ntqV6rf7zlaIClPLfcDORe9M Jd8g== Received: by 10.68.193.167 with SMTP id hp7mr27163922pbc.65.1334576035340; Mon, 16 Apr 2012 04:33:55 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id l6sm17474160pbp.33.2012.04.16.04.33.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Apr 2012 04:33:55 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 02/32] mke2fs: make it support inline data feature Date: Mon, 16 Apr 2012 19:39:37 +0800 Message-Id: <1334576407-4007-3-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1334576407-4007-1-git-send-email-wenqing.lz@taobao.com> References: <1334576407-4007-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 EXT2_FEATURE_COMPAT_EXT_ATTR flag will be set when inline_data is set because inline data feature depends on it. Signed-off-by: Zheng Liu --- misc/mke2fs.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 7ec8cc2..145a6a8 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -856,7 +856,8 @@ static __u32 ok_features[3] = { EXT2_FEATURE_INCOMPAT_META_BG| EXT4_FEATURE_INCOMPAT_FLEX_BG| EXT4_FEATURE_INCOMPAT_MMP | - EXT4_FEATURE_INCOMPAT_64BIT, + EXT4_FEATURE_INCOMPAT_64BIT| + EXT4_FEATURE_INCOMPAT_INLINE_DATA, /* R/O compat */ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| EXT4_FEATURE_RO_COMPAT_HUGE_FILE| @@ -1922,6 +1923,13 @@ profile_error: exit(1); } + /* if inline_data is set, ext_attr would be set because inline_data + * depends on it. + */ + if ((fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_INLINE_DATA) && + !(fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) + fs_param.s_feature_compat |= EXT2_FEATURE_COMPAT_EXT_ATTR; + if (fs_param.s_blocks_per_group) { if (fs_param.s_blocks_per_group < 256 || fs_param.s_blocks_per_group > 8 * (unsigned) blocksize) {