AOSP: e2fsdroid: report error from ext2fs

Returns error back to caller (build system) instead of failing silently.

Change-Id: I8bad9eed6fe639014126c98c6bf02e539f086a98
From AOSP commit: 948b9fecf8f92785a171c9416080e0660f089deb

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/contrib/android/fsmap.c b/contrib/android/fsmap.c
index 0a4867bfd5ea30c26a648ead472b412165006bef..36adb7f0a43ebe797f2efe40b54914e3c4c2cd83 100644 (file)
--- a/contrib/android/fsmap.c
+++ b/contrib/android/fsmap.c
@@ -87,31 +87,33 @@ static int walk_ext_dir(ext2_ino_t dir EXT2FS_ATTR((unused)),
                return retval;
        format->end_new_file(format->private);
 
+       retval = 0;
        if (is_dir(pdata->fs, de->inode)) {
                cur_path = pdata->path;
                pdata->path = filename;
-               ext2fs_dir_iterate2(pdata->fs, de->inode, 0, NULL,
+               retval = ext2fs_dir_iterate2(pdata->fs, de->inode, 0, NULL,
                                    walk_ext_dir, pdata);
                pdata->path = cur_path;
        }
 
 end:
        free(filename);
-       return 0;
+       return retval;
 }
 
 errcode_t fsmap_iter_filsys(ext2_filsys fs, struct fsmap_format *format,
                            const char *file, const char *mountpoint)
 {
        struct walk_ext_priv_data pdata;
+       errcode_t retval;
 
        format->private = format->init(file, mountpoint);
        pdata.fs = fs;
        pdata.path = "";
        pdata.format = format;
 
-       ext2fs_dir_iterate2(fs, EXT2_ROOT_INO, 0, NULL, walk_ext_dir, &pdata);
+       retval = ext2fs_dir_iterate2(fs, EXT2_ROOT_INO, 0, NULL, walk_ext_dir, &pdata);
 
        format->cleanup(format->private);
-       return 0;
+       return retval;
 }