From: Allison Henderson <allison.henderson@xxxxxxxxxx>
Inodes created from protofile parsing will also need to add the
appropriate parent pointers.
Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
[djwong: use xfs_parent_add from libxfs instead of open-coding xfs_attr_set]
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
mkfs/proto.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/mkfs/proto.c b/mkfs/proto.c
index ea31cfe5c..d6999b850 100644
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -378,6 +378,20 @@ newdirectory(
fail(_("directory create error"), error);
}
+static struct xfs_parent_defer *
+newpptr(
+ struct xfs_mount *mp)
+{
+ struct xfs_parent_defer *ret;
+ int error;
+
+ error = -libxfs_parent_start(mp, &ret);
+ if (error)
+ fail(_("initializing parent pointer"), error);
+
+ return ret;
+}
+
static void
parseproto(
xfs_mount_t *mp,
@@ -412,6 +426,7 @@ parseproto(
struct cred creds;
char *value;
struct xfs_name xname;
+ struct xfs_parent_defer *parent = NULL;
memset(&creds, 0, sizeof(creds));
mstr = getstr(pp);
@@ -486,6 +501,7 @@ parseproto(
case IF_REGULAR:
buf = newregfile(pp, &len);
tp = getres(mp, XFS_B_TO_FSB(mp, len));
+ parent = newpptr(mp);
error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFREG, 1, 0,
&creds, fsxp, &ip);
if (error)
@@ -509,7 +525,7 @@ parseproto(
exit(1);
}
tp = getres(mp, XFS_B_TO_FSB(mp, llen));
-
+ parent = newpptr(mp);
error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFREG, 1, 0,
&creds, fsxp, &ip);
if (error)
@@ -520,15 +536,24 @@ parseproto(
xname.type = XFS_DIR3_FT_REG_FILE;
newdirent(mp, tp, pip, &xname, ip->i_ino);
libxfs_trans_log_inode(tp, ip, flags);
+ if (parent) {
+ error = -libxfs_parent_add(tp, parent, pip, &xname,
+ ip);
+ if (error)
+ fail(_("committing parent pointers failed."),
+ error);
+ }
error = -libxfs_trans_commit(tp);
if (error)
fail(_("Space preallocation failed."), error);
+ libxfs_parent_finish(mp, parent);
rsvfile(mp, ip, llen);
libxfs_irele(ip);
return;
case IF_BLOCK:
tp = getres(mp, 0);
+ parent = newpptr(mp);
majdev = getnum(getstr(pp), 0, 0, false);
mindev = getnum(getstr(pp), 0, 0, false);
error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFBLK, 1,
@@ -544,6 +569,7 @@ parseproto(
case IF_CHAR:
tp = getres(mp, 0);
+ parent = newpptr(mp);
majdev = getnum(getstr(pp), 0, 0, false);
mindev = getnum(getstr(pp), 0, 0, false);
error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFCHR, 1,
@@ -558,6 +584,7 @@ parseproto(
case IF_FIFO:
tp = getres(mp, 0);
+ parent = newpptr(mp);
error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFIFO, 1, 0,
&creds, fsxp, &ip);
if (error)
@@ -570,6 +597,7 @@ parseproto(
buf = getstr(pp);
len = (int)strlen(buf);
tp = getres(mp, XFS_B_TO_FSB(mp, len));
+ parent = newpptr(mp);
error = -libxfs_dir_ialloc(&tp, pip, mode|S_IFLNK, 1, 0,
&creds, fsxp, &ip);
if (error)
@@ -592,6 +620,7 @@ parseproto(
libxfs_log_sb(tp);
isroot = 1;
} else {
+ parent = newpptr(mp);
libxfs_trans_ijoin(tp, pip, 0);
xname.type = XFS_DIR3_FT_DIR;
newdirent(mp, tp, pip, &xname, ip->i_ino);
@@ -600,9 +629,19 @@ parseproto(
}
newdirectory(mp, tp, ip, pip);
libxfs_trans_log_inode(tp, ip, flags);
+ if (parent) {
+ error = -libxfs_parent_add(tp, parent, pip, &xname,
+ ip);
+ if (error)
+ fail(_("committing parent pointers failed."),
+ error);
+ }
error = -libxfs_trans_commit(tp);
if (error)
fail(_("Directory inode allocation failed."), error);
+
+ libxfs_parent_finish(mp, parent);
+
/*
* RT initialization. Do this here to ensure that
* the RT inodes get placed after the root inode.
@@ -625,11 +664,18 @@ parseproto(
fail(_("Unknown format"), EINVAL);
}
libxfs_trans_log_inode(tp, ip, flags);
+ if (parent) {
+ error = -libxfs_parent_add(tp, parent, pip, &xname, ip);
+ if (error)
+ fail(_("committing parent pointers failed."), error);
+ }
error = -libxfs_trans_commit(tp);
if (error) {
fail(_("Error encountered creating file from prototype file"),
error);
}
+
+ libxfs_parent_finish(mp, parent);
libxfs_irele(ip);
}
