From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 14 Mar 2014 13:31:02 +0000 (-0400)
Subject: resize2fs: add inline dirs for remapping
X-Git-Tag: v1.43-WIP-2015-05-18~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d05c9c7ace8322c774172357e48390f5412b7d19;p=thirdparty%2Fe2fsprogs.git

resize2fs: add inline dirs for remapping

When we're looking for directory blocks for the inode remapping step,
we need to include inline_data directories in the remap process.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 7122b2fb4..f5f1337af 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -1712,6 +1712,13 @@ remap_blocks:
 				retval = pb.error;
 				goto errout;
 			}
+		} else if ((inode->i_flags & EXT4_INLINE_DATA_FL) &&
+			   (rfs->bmap || pb.is_dir)) {
+			/* inline data dir; update it too */
+			retval = ext2fs_add_dir_block2(rfs->old_fs->dblist,
+						       new_inode, 0, 0);
+			if (retval)
+				goto errout;
 		}
 	}
 	io_channel_flush(rfs->old_fs->io);