Only load name if read succeeds

Thanks Akiko for supplying this patch.

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

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 7678896692927f47290c1b8b6dadc1da7deb41d0..40a5b46cf6caff782ed5bddd68430d944ba3f81f 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -4534,13 +4534,11 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size)
 
                if (obj->hdr_chunk > 0) {
                        result = yaffs_rd_chunk_tags_nand(obj->my_dev,
 
                if (obj->hdr_chunk > 0) {
                        result = yaffs_rd_chunk_tags_nand(obj->my_dev,

-                                                         obj->hdr_chunk,
-                                                         buffer, NULL);
+                               obj->hdr_chunk, buffer, NULL);
+                       if (result == YAFFS_OK)
+                               yaffs_load_name_from_oh(obj->my_dev, name,
+                                       oh->name, buffer_size);

                }
                }

-               if (result == YAFFS_OK)
-                       yaffs_load_name_from_oh(obj->my_dev, name, oh->name,
-                                       buffer_size);
-

                yaffs_release_temp_buffer(obj->my_dev, buffer);
        }
 
                yaffs_release_temp_buffer(obj->my_dev, buffer);
        }