Skip to content

Commit 7c033b7

Browse files
geliangtangpundiramit
authored andcommitted
f2fs: use rb_entry_safe
commit ed0b56209fe79a1309653d4b03f5c3147f580f6b upstream. Use rb_entry_safe() instead of open-coding it. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 7174466 commit 7c033b7

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

fs/f2fs/extent_cache.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -311,28 +311,24 @@ static struct extent_node *__lookup_extent_tree_ret(struct extent_tree *et,
311311
tmp_node = parent;
312312
if (parent && fofs > en->ei.fofs)
313313
tmp_node = rb_next(parent);
314-
*next_ex = tmp_node ?
315-
rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
314+
*next_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
316315

317316
tmp_node = parent;
318317
if (parent && fofs < en->ei.fofs)
319318
tmp_node = rb_prev(parent);
320-
*prev_ex = tmp_node ?
321-
rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
319+
*prev_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
322320
return NULL;
323321

324322
lookup_neighbors:
325323
if (fofs == en->ei.fofs) {
326324
/* lookup prev node for merging backward later */
327325
tmp_node = rb_prev(&en->rb_node);
328-
*prev_ex = tmp_node ?
329-
rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
326+
*prev_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
330327
}
331328
if (fofs == en->ei.fofs + en->ei.len - 1) {
332329
/* lookup next node for merging frontward later */
333330
tmp_node = rb_next(&en->rb_node);
334-
*next_ex = tmp_node ?
335-
rb_entry(tmp_node, struct extent_node, rb_node) : NULL;
331+
*next_ex = rb_entry_safe(tmp_node, struct extent_node, rb_node);
336332
}
337333
return en;
338334
}
@@ -493,9 +489,8 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode,
493489
if (!next_en) {
494490
struct rb_node *node = rb_next(&en->rb_node);
495491

496-
next_en = node ?
497-
rb_entry(node, struct extent_node, rb_node)
498-
: NULL;
492+
next_en = rb_entry_safe(node, struct extent_node,
493+
rb_node);
499494
}
500495

501496
if (parts)

0 commit comments

Comments
 (0)