aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2016-04-06 11:27:03 -0700
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:33:19 +0200
commitf48aceae54a7f0ad77c38dfbc5ab0a0f18990245 (patch)
treed242e7a878c3e2c7dc78c2c2231605f879dc3802
parent228b1c11e11f453e252be13cd3be32d9b4da7fbf (diff)
downloadandroid_kernel_m2note-f48aceae54a7f0ad77c38dfbc5ab0a0f18990245.tar.gz
f2fs: remove redundant condition check
This patch resolves the redundant condition check reported by David. Reported-by: David Binderman <dcb314@hotmail.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/checkpoint.c2
-rw-r--r--fs/f2fs/data.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 70fd90b73..2e27b9fdf 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -212,7 +212,7 @@ void ra_meta_pages_cond(struct f2fs_sb_info *sbi, pgoff_t index)
bool readahead = false;
page = find_get_page(META_MAPPING(sbi), index);
- if (!page || (page && !PageUptodate(page)))
+ if (!page || !PageUptodate(page))
readahead = true;
f2fs_put_page(page, 0);
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 3b79ee6d5..9896093c0 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1496,7 +1496,7 @@ restart:
} else {
/* hole case */
err = get_dnode_of_data(&dn, index, LOOKUP_NODE);
- if (err || (!err && dn.data_blkaddr == NULL_ADDR)) {
+ if (err || dn.data_blkaddr == NULL_ADDR) {
f2fs_put_dnode(&dn);
f2fs_lock_op(sbi);
locked = true;