[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1457666928-14475-1-git-send-email-shawn.lin@rock-chips.com>
Date: Fri, 11 Mar 2016 11:28:48 +0800
From: Shawn Lin <shawn.lin@...k-chips.com>
To: Jaegeuk Kim <jaegeuk@...nel.org>
Cc: linux-kernel@...r.kernel.org,
linux-f2fs-devel@...ts.sourceforge.net,
Shawn Lin <shawn.lin@...k-chips.com>
Subject: [PATCH 4/8] f2fs: remove redundant checking of inline data flag
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 <shawn.lin@...k-chips.com>
---
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 38c834e..d60d5f0 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
Powered by blists - more mailing lists