Supplied changelog for resize inode patch.

[tools/e2fsprogs.git] / lib / ext2fs / finddev.c

diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
index 69b5d4b..2e9d70a 100644 (file)
--- a/lib/ext2fs/finddev.c
+++ b/lib/ext2fs/finddev.c
@@ -31,12 +31,7 @@
 #include <sys/mkdev.h>
 #endif
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fs.h"
 
 struct dir_list {
@@ -106,15 +101,18 @@ static int scan_dir(char *dirname, dev_t device, struct dir_list **list,
                        add_to_dirlist(path, list);
                if (S_ISBLK(st.st_mode) && st.st_rdev == device) {
                        cp = malloc(strlen(path)+1);
-                       if (!cp)
+                       if (!cp) {
+                               closedir(dir);
                                return ENOMEM;
+                       }
                        strcpy(cp, path);
                        *ret_path = cp;
-                       return 0;
+                       goto success;
                }
        skip_to_next:
                dp = readdir(dir);
        }
+success:
        closedir(dir);
        return 0;
 }