From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 2 Jan 2020 15:59:13 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.46.0~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32d33132a8174b22bffea3a59cecd2f3e835afe9;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

32d33132a8174b22bffea3a59cecd2f3e835afe9
diff --cc e2fsck/pass2.c
index 306373bf7,06f095493..d3f210172
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@@ -993,9 -931,10 +993,10 @@@ static int check_dir_block(ext2_filsys 
  	int	is_leaf = 1;
  	size_t	inline_data_size = 0;
  	int	filetype = 0;
 -	int	encrypted = 0;
 +	__u32   dir_encpolicy_id = NO_ENCRYPTION_POLICY;
  	size_t	max_block_size;
  	int	hash_flags = 0;
+ 	static char *eop_read_dirblock = NULL;
  
  	cd = (struct check_dir_struct *) priv_data;
  	ibuf = buf = cd->buf;