yaffs: Clean up defeated conditional.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 1c0ae71320a52fc5645e09fd76e5203c348ab8c7..dd35e25f3879fd02a5f39e4089860cb3006ebdd9 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -1922,21 +1922,18 @@ static int yaffs_new_obj_id(struct yaffs_dev *dev)
        struct list_head *i;
        u32 n = (u32) bucket;
 
        struct list_head *i;
        u32 n = (u32) bucket;
 

-       /* Now find an object value that has not already been taken
-        * by scanning the list.
+       /*
+        * Now find an object value that has not already been taken
+        * by scanning the list, incrementing each time by number of buckets.

         */
         */

-

        while (!found) {
                found = 1;
                n += YAFFS_NOBJECT_BUCKETS;
        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) {
+                       /* Check if this value is already taken. */
+                       if (i && list_entry(i, struct yaffs_obj,
+                                           hash_link)->obj_id == n)
+                               found = 0;

                }
        }
        return n;
                }
        }
        return n;