xfs
[Top] [All Lists]

[PATCH] repair: Set ftype for entries in lost+found

To: xfs@xxxxxxxxxxx
Subject: [PATCH] repair: Set ftype for entries in lost+found
From: Jan Kara <jack@xxxxxxx>
Date: Mon, 21 Jul 2014 21:21:25 +0200
Cc: Jan Kara <jack@xxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
So far all entries in lost+found had file type XFS_DIR3_FT_UNKNOWN which
is somewhat annoying as the next xfs_repair pass will find these and
report as an error. Set proper file type when creating these entries.

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 repair/phase6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repair/phase6.c b/repair/phase6.c
index f13069f4cd71..0ec4f07ca1c2 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1097,8 +1097,6 @@ mv_orphanage(
        xname.name = fname;
        xname.len = snprintf((char *)fname, sizeof(fname), "%llu",
                                (unsigned long long)ino);
-       /* XXX use xfs_mode_to_ftype[] when userspace gains it */
-       xname.type = XFS_DIR3_FT_UNKNOWN;
 
        err = libxfs_iget(mp, NULL, orphanage_ino, 0, &orphanage_ip, 0);
        if (err)
@@ -1117,6 +1115,8 @@ mv_orphanage(
        if ((err = libxfs_iget(mp, NULL, ino, 0, &ino_p, 0)))
                do_error(_("%d - couldn't iget disconnected inode\n"), err);
 
+       xname.type = xfs_mode_to_ftype[(ino_p->i_d.di_mode & S_IFMT)>>S_SHIFT];
+
        if (isa_dir)  {
                irec = find_inode_rec(mp, XFS_INO_TO_AGNO(mp, orphanage_ino),
                                XFS_INO_TO_AGINO(mp, orphanage_ino));
-- 
1.8.1.4

<Prev in Thread] Current Thread [Next in Thread>