Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933611AbcCKChx (ORCPT ); Thu, 10 Mar 2016 21:37:53 -0500 Received: from lucky1.263xmail.com ([211.157.147.130]:49266 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933259AbcCKChs (ORCPT ); Thu, 10 Mar 2016 21:37:48 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: jaegeuk@kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: <15a965e29372f9b99dbcefebedbeec95> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Shawn Lin To: Jaegeuk Kim Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Shawn Lin Subject: [PATCH 2/2] f2fs: remove redundant checking of inline data flag Date: Fri, 11 Mar 2016 10:29:44 +0800 Message-Id: <1457663384-19856-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 871 Lines: 30 Remove the f2fs_has_inline_data for f2fs_read_data_page, and let f2fs_read_inline_data take over gatekeeper of checking inline data flag. Signed-off-by: Shawn Lin --- fs/f2fs/data.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index e5c762b..e4aa8af 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1047,9 +1047,9 @@ static int f2fs_read_data_page(struct file *file, struct page *page) trace_f2fs_readpage(page, DATA); - /* If the file has inline data, try to read it directly */ - if (f2fs_has_inline_data(inode)) - ret = f2fs_read_inline_data(inode, page); + /* Firstly, let's try to read inline data directly */ + ret = f2fs_read_inline_data(inode, page); + if (ret == -EAGAIN) ret = f2fs_mpage_readpages(page->mapping, NULL, page, 1); return ret; -- 2.3.7