Merge branch 'maint' into next

diff --cc lib/ext2fs/link.c
index 2a445758e7defa863187bfe88b87d69fa0f61c30,bf3c859a51398e495fdbae4cee26ca545524b0f5..09e6cb450fbbadab8b8e5884a34cc33f295d3eb0
--- 1/lib/ext2fs/link.c
--- 2/lib/ext2fs/link.c
+++ b/lib/ext2fs/link.c
@@@ -41,11 -41,9 +41,11 @@@ static int link_proc(struct ext2_dir_en
        struct ext2_dir_entry *next;
        unsigned int rec_len, min_rec_len, curr_rec_len;
        int ret = 0;
 +      int csum_size = 0;
 +      struct ext2_dir_entry_tail *t;
  
        if (ls->done)
-               return 0;
+               return DIRENT_ABORT;
  
        rec_len = EXT2_DIR_REC_LEN(ls->namelen);
  

diff --cc misc/mke2fs.c
Simple merge