yaffs2: rework yaffs_new_obj_id

[u-boot] / fs / yaffs2 / yaffs_guts.c

diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
index 32e6ff2a040660ad22e43f19fc38920fdede1a02..bbe0d700fb63e8d7754d37163dbbaef45745daa3 100644 (file)
--- 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;
                        }
                }
        }