Switch back to 1.42.9 now that there is a fix
Revert "Revert changes that moved from 1.41.14 to 1.42.9"
This reverts commit 65f0aab98b20b5994a726ab90d355248bcddfffd.
diff --git a/lib/ext2fs/valid_blk.c b/lib/ext2fs/valid_blk.c
index 32ac9e6..7c3defc 100644
--- a/lib/ext2fs/valid_blk.c
+++ b/lib/ext2fs/valid_blk.c
@@ -23,7 +23,7 @@
* This function returns 1 if the inode's block entries actually
* contain block entries.
*/
-int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
+int ext2fs_inode_has_valid_blocks2(ext2_filsys fs, struct ext2_inode *inode)
{
/*
* Only directories, regular files, and some symbolic links
@@ -38,7 +38,7 @@
* target is stored in the block entries.
*/
if (LINUX_S_ISLNK (inode->i_mode)) {
- if (inode->i_file_acl == 0) {
+ if (ext2fs_file_acl_block(fs, inode) == 0) {
/* With no EA block, we can rely on i_blocks */
if (inode->i_blocks == 0)
return 0;
@@ -53,3 +53,8 @@
}
return 1;
}
+
+int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
+{
+ return ext2fs_inode_has_valid_blocks2(NULL, inode);
+}