From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 24 Oct 2013 00:17:35 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~374
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=7e0337ed742d0f31739984d8a4dbcc67d8a4cd88;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

7e0337ed742d0f31739984d8a4dbcc67d8a4cd88
diff --cc lib/ext2fs/link.c
index 2a44575,bf3c859..09e6cb4
--- a/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);