From 76df275ce53c0435ff4df2e8f1015522d39efd38 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 9 Nov 2017 01:26:43 +0100 Subject: [PATCH] yaffs2: rework yaffs_new_obj_id The iterator variable of list_for_each is never NULL. if (1 || A) is always true. Use break if entry found. Signed-off-by: Heinrich Schuchardt --- fs/yaffs2/yaffs_guts.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c index 32e6ff2a04..bbe0d700fb 100644 --- a/fs/yaffs2/yaffs_guts.c +++ b/fs/yaffs2/yaffs_guts.c @@ -1870,13 +1870,12 @@ static int yaffs_new_obj_id(struct yaffs_dev *dev) while (!found) { found = 1; n += YAFFS_NOBJECT_BUCKETS; - if (1 || dev->obj_bucket[bucket].count > 0) { - list_for_each(i, &dev->obj_bucket[bucket].list) { - /* If there is already one in the list */ - if (i && list_entry(i, struct yaffs_obj, - hash_link)->obj_id == n) { - found = 0; - } + list_for_each(i, &dev->obj_bucket[bucket].list) { + /* If there is already one in the list */ + if (i && list_entry(i, struct yaffs_obj, + hash_link)->obj_id == n) { + found = 0; + break; } } } -- 2.25.1