From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933594AbbLWJw0 (ORCPT ); Wed, 23 Dec 2015 04:52:26 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:45794 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932279AbbLWJwY (ORCPT ); Wed, 23 Dec 2015 04:52:24 -0500 X-AuditID: cbfee61a-f79266d000003652-30-567a6ecdceb1 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] f2fs: don't convert inline inode when inline_data option is disable Date: Wed, 23 Dec 2015 17:51:35 +0800 Message-id: <010d01d13d67$9a0eebd0$ce2cc370$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdE9ZzzGpHDM79ttQ8WhOglfnfRAtA== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsVy+t9jQd1zeVVhBk+uslg8WT+L2eLSIneL y7vmsDkwe2xa1cnmsXvBZyaPz5vkApijuGxSUnMyy1KL9O0SuDLm9jaxFbRyVRy9rtDAuJmj i5GTQ0LARGLnhEZGCFtM4sK99WxdjFwcQgKzGCX+HFvGAuG8YpT40LaWDaSKTUBFYnnHfyYQ WwTIPrToMjuIzSzgIdHY8Z21i5GDQ1ggSmLxUQ+QMIuAqsTyF/NZQWxeAUuJJS+XskPYghI/ Jt9jgWjVkli/8zgThC0vsXnNW2aIgxQkdpx9zQixSk/i18YjUKvEJTYeucUygRHoSoRRs5CM moVk1CwkLQsYWVYxSqQWJBcUJ6XnGuallusVJ+YWl+al6yXn525iBIfwM6kdjAd3uR9iFOBg VOLhdWirDBNiTSwrrsw9xCjBwawkwpv+DijEm5JYWZValB9fVJqTWnyIUZqDRUmct/ZSZJiQ QHpiSWp2ampBahFMlomDU6qBUapiEXem7cVuTVY9t7t/ruYxT8utddtyct+TqhnXL05xbYgL lki4YWuZUzsvJtRnst67vI9FPP4Lz2vYc/yaIfo56Kxtmt/6lVvm1YmYbnwdFnBOd3+DanOj 1yGBv1VldyoUTvq78IdwrWc51dL54jRnJcesvrO10e2cuVN+9b3fw3K6lU1ViaU4I9FQi7mo OBEAF63RLV0CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If inline_data option is disable, when truncating an inline inode with size which is not exceed maxinum inline size, we should not convert inline inode to regular one to avoid the overhead of synchronizing conversion. Signed-off-by: Chao Yu --- fs/f2fs/inline.c | 3 --- fs/f2fs/namei.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index c24e5d9..5ffbd16 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -16,9 +16,6 @@ bool f2fs_may_inline_data(struct inode *inode) { - if (!test_opt(F2FS_I_SB(inode), INLINE_DATA)) - return false; - if (f2fs_is_atomic_file(inode)) return false; diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 8d2616f..8655dc8 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -60,7 +60,7 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode) if (f2fs_encrypted_inode(dir) && f2fs_may_encrypt(inode)) f2fs_set_encrypted_inode(inode); - if (f2fs_may_inline_data(inode)) + if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode)) set_inode_flag(F2FS_I(inode), FI_INLINE_DATA); if (f2fs_may_inline_dentry(inode)) set_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY); -- 2.6.3