Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934188AbcCKDhP (ORCPT ); Thu, 10 Mar 2016 22:37:15 -0500 Received: from lucky1.263xmail.com ([211.157.147.131]:34590 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934111AbcCKDhK (ORCPT ); Thu, 10 Mar 2016 22:37:10 -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: 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 6/8] f2fs: remove checing inline data flag for f2fs_fiemap Date: Fri, 11 Mar 2016 11:29:06 +0800 Message-Id: <1457666946-14559-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1457666880-14311-1-git-send-email-shawn.lin@rock-chips.com> References: <1457666880-14311-1-git-send-email-shawn.lin@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 784 Lines: 32 Remove the f2fs_has_inline_data for f2fs_fiemap, and let f2fs_inline_data_fiemap take over gatekeeper of checking inline data flag. Signed-off-by: Shawn Lin --- fs/f2fs/data.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index d60d5f0..c88d79c 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -817,11 +817,9 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, if (ret) return ret; - if (f2fs_has_inline_data(inode)) { - ret = f2fs_inline_data_fiemap(inode, fieinfo, start, len); - if (ret != -EAGAIN) - return ret; - } + ret = f2fs_inline_data_fiemap(inode, fieinfo, start, len); + if (ret != -EAGAIN) + return ret; inode_lock(inode); -- 2.3.7