From patchwork Mon Nov 21 16:39:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 126875 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 1022FB7213 for ; Tue, 22 Nov 2011 04:41:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756166Ab1KURlF (ORCPT ); Mon, 21 Nov 2011 12:41:05 -0500 Received: from oproxy5-pub.bluehost.com ([67.222.38.55]:57376 "HELO oproxy5-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752046Ab1KURlE (ORCPT ); Mon, 21 Nov 2011 12:41:04 -0500 Received: (qmail 13465 invoked by uid 0); 21 Nov 2011 17:41:00 -0000 Received: from unknown (HELO box585.bluehost.com) (66.147.242.185) by cpoproxy2.bluehost.com with SMTP; 21 Nov 2011 17:41:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tao.ma; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=q2KF80Pzd+ze5ypE1pIo080P8xzkldfyevkI4GsLvPo=; b=PviCtVNSgcBLJmJvA+z6qXHiR/tacN1SaEGv8dygCUiJqXYSX3NDVDKyECXxtj2Zy9vCOnC2rgNapa6lZ4VE3JESz89ze6L0s/9oxOoFD5Jpr5iqUK5n9/HyzzEn+Z9W; Received: from [221.217.44.83] (helo=localhost.localdomain) by box585.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RSWy6-0003wZ-A3; Mon, 21 Nov 2011 09:43:43 -0700 From: Tao Ma To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, adilger@dilger.ca Subject: [PATCH V2 19/19] ext4: Enable ext4 inline support. Date: Tue, 22 Nov 2011 00:39:57 +0800 Message-Id: <1321893597-11024-19-git-send-email-tm@tao.ma> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1321893597-11024-1-git-send-email-tm@tao.ma> References: <4ECA7DB3.9040605@tao.ma> <1321893597-11024-1-git-send-email-tm@tao.ma> X-Identified-User: {1390:box585.bluehost.com:colyli:tao.ma} {sentby:smtp auth 221.217.44.83 authed with tm@tao.ma} Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Tao Ma Signed-off-by: Tao Ma --- fs/ext4/ext4.h | 1 + fs/ext4/ialloc.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a88bc00..784893a 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1414,6 +1414,7 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 #define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 /* EA in inode */ #define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 /* data in dirent */ +#define EXT4_FEATURE_INCOMPAT_INLINEDATA 0x2000 /* data in inode */ #define EXT2_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR #define EXT2_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \ diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 00beb4f..4f7fe21 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -897,6 +897,10 @@ got: ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize; + ei->i_inline_off = 0; + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_INLINEDATA)) + ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); + ret = inode; dquot_initialize(inode); err = dquot_alloc_inode(inode);