From: Anthony Iliopoulos <ailiop@suse.com>
Date: Wed, 9 Dec 2020 17:20:40 +0000 (-0500)
Subject: xfs_repair: remove obsolete code for handling mountpoint inodes
X-Git-Tag: v5.10.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92065bfd1a29924d0c21b53aa03ade61f4b0f907;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: remove obsolete code for handling mountpoint inodes

The S_IFMNT file type was never supported in Linux, remove the related
code that was supposed to deal with it, along with the translation file
entries.

Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/po/de.po b/po/de.po
index fab26677e..aa9af769a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11774,11 +11774,6 @@ msgstr ""
 msgid "component of symlink in inode %llu too long\n"
 msgstr "Bestandteil des symbolischen Verweises in Inode %llu zu lang\n"
 
-#: .././repair/dinode.c:1611
-#, c-format
-msgid "inode %llu has bad inode type (IFMNT)\n"
-msgstr "Inode %llu hat falschen Inode-Typ (IFMNT)\n"
-
 #: .././repair/dinode.c:1621
 #, c-format
 msgid "size of character device inode %llu != 0 (%lld bytes)\n"
diff --git a/po/pl.po b/po/pl.po
index 4c6ac82f4..cf9d2e8ed 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13857,11 +13857,6 @@ msgstr ""
 "znaleziono niedozwolony znak null w i-węźle dowiązania symbolicznego "
 "%<PRIu64>\n"
 
-#: .././repair/dinode.c:1344
-#, c-format
-msgid "inode %<PRIu64> has bad inode type (IFMNT)\n"
-msgstr "i-węzeł %<PRIu64> ma błędny typ i-węzła (IFMNT)\n"
-
 #: .././repair/dinode.c:1355
 #, c-format
 msgid "size of character device inode %<PRIu64> != 0 (%<PRId64> bytes)\n"
diff --git a/repair/dinode.c b/repair/dinode.c
index 282b5fa90..291c58073 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1392,17 +1392,6 @@ process_misc_ino_types(xfs_mount_t	*mp,
 			xfs_ino_t	lino,
 			int		type)
 {
-	/*
-	 * disallow mountpoint inodes until such time as the
-	 * kernel actually allows them to be created (will
-	 * probably require a superblock version rev, sigh).
-	 */
-	if (type == XR_INO_MOUNTPOINT)  {
-		do_warn(
-_("inode %" PRIu64 " has bad inode type (IFMNT)\n"), lino);
-		return(1);
-	}
-
 	/*
 	 * must also have a zero size
 	 */
@@ -1688,7 +1677,6 @@ _("directory inode %" PRIu64 " has bad size %" PRId64 "\n"),
 	case XR_INO_CHRDEV:	/* fall through to FIFO case ... */
 	case XR_INO_BLKDEV:	/* fall through to FIFO case ... */
 	case XR_INO_SOCK:	/* fall through to FIFO case ... */
-	case XR_INO_MOUNTPOINT:	/* fall through to FIFO case ... */
 	case XR_INO_FIFO:
 		if (process_misc_ino_types(mp, dino, lino, type))
 			return 1;
diff --git a/repair/incore.h b/repair/incore.h
index 5b29d5d1e..074ca98a3 100644
--- a/repair/incore.h
+++ b/repair/incore.h
@@ -214,7 +214,6 @@ int		count_bcnt_extents(xfs_agnumber_t);
 #define XR_INO_BLKDEV	8		/* block device */
 #define XR_INO_SOCK	9		/* socket */
 #define XR_INO_FIFO	10		/* fifo */
-#define XR_INO_MOUNTPOINT 11		/* mountpoint */
 #define XR_INO_UQUOTA	12		/* user quota inode */
 #define XR_INO_GQUOTA	13		/* group quota inode */
 #define XR_INO_PQUOTA	14		/* project quota inode */