From: Jie Liu <jeff.liu@xxxxxxxxxx>
Simplify the code in drop_last_node() via list_last_entry_or_null().
Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
---
fs/ubifs/recovery.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 065096e..e46c394 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -603,12 +603,10 @@ static void drop_last_group(struct ubifs_scan_leb *sleb, int *offs)
*/
static void drop_last_node(struct ubifs_scan_leb *sleb, int *offs)
{
- struct ubifs_scan_node *snod;
-
- if (!list_empty(&sleb->nodes)) {
- snod = list_entry(sleb->nodes.prev, struct ubifs_scan_node,
- list);
+ struct ubifs_scan_node *snod = list_last_entry_or_null(&sleb->nodes,
+ struct ubifs_scan_node, list);
+ if (snod) {
dbg_rcvry("dropping last node at %d:%d",
sleb->lnum, snod->offs);
*offs = snod->offs;
--
1.8.3.2
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
