From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 25 Jul 2014 12:55:03 +0000 (+0200)
Subject: various: erase all traces of the long-obsolete xiafs
X-Git-Tag: v2.26-rc1~586
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=556c9c484288e9d1514a44ea0a3a72b6cc8c9232;p=thirdparty%2Futil-linux.git

various: erase all traces of the long-obsolete xiafs

The xiafs filesystem was removed from the kernel fifteen years ago,
and any kernel that contained it reached end of life ten years ago.
It's time to stop mentioning it in the mount man page and elsewhere.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/bash-completion/findmnt b/bash-completion/findmnt
index 3ed331ac03..0f62aa434e 100644
--- a/bash-completion/findmnt
+++ b/bash-completion/findmnt
@@ -61,8 +61,7 @@ _findmnt_module()
 				hfsplus hpfs iso9660 jfs minix msdos
 				ncpfs nfs nfs4 ntfs proc qnx4 ramfs
 				reiserfs romfs squashfs smbfs sysv tmpfs
-				ubifs udf ufs umsdos usbfs vfat xenix xfs
-				xiafs"
+				ubifs udf ufs umsdos usbfs vfat xenix xfs"
 			COMPREPLY=( $(compgen -W "$TYPES" -- $cur) )
 			return 0
 			;;
diff --git a/bash-completion/mount b/bash-completion/mount
index db97a918ac..7ebcec33e3 100644
--- a/bash-completion/mount
+++ b/bash-completion/mount
@@ -20,7 +20,7 @@ devpts	  nodevpts	nfs4	  nonfs4	usbfs	  nousbfs
 efs	  noefs		ntfs	  nontfs	vfat	  novfat
 ext	  noext		proc	  noproc	xenix	  noxenix
 ext2	  noext2	qnx4	  noqnx4	xfs	  noxfs
-ext3	  noext3	ramfs	  noramfs	xiafs	  noxiafs
+ext3	  noext3	ramfs	  noramfs
 ext4	  noext4	reiserfs  noreiserfs
 hfs	  nohfs		romfs	  noromfs
 "
diff --git a/bash-completion/umount b/bash-completion/umount
index f178bd7729..5be921ef7a 100644
--- a/bash-completion/umount
+++ b/bash-completion/umount
@@ -20,7 +20,7 @@ devpts	  nodevpts	nfs4	  nonfs4	usbfs	  nousbfs
 efs	  noefs		ntfs	  nontfs	vfat	  novfat
 ext	  noext		proc	  noproc	xenix	  noxenix
 ext2	  noext2	qnx4	  noqnx4	xfs	  noxfs
-ext3	  noext3	ramfs	  noramfs	xiafs	  noxiafs
+ext3	  noext3	ramfs	  noramfs
 ext4	  noext4	reiserfs  noreiserfs
 "
 			COMPREPLY=( $(compgen -W "$TYPES" -- $cur) )
diff --git a/disk-utils/fsck.8 b/disk-utils/fsck.8
index 51864d39a5..833fca2aa8 100644
--- a/disk-utils/fsck.8
+++ b/disk-utils/fsck.8
@@ -457,7 +457,6 @@ or
 .BR fsck.nfs (8),
 .BR fsck.vfat (8),
 .BR fsck.xfs (8),
-.BR fsck.xiafs (8),
 .BR reiserfsck (8).
 .ad
 .SH AUTHOR
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 40c59c6668..a0f9db1d58 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -81,8 +81,7 @@ static const char *really_wanted[] = {
 	"ext4",
 	"ext4dev",
 	"jfs",
-	"reiserfs",
-	"xiafs"
+	"reiserfs"
 };
 
 /*
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 6246db9375..675822d90b 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -100,8 +100,7 @@ for the ext2 filesystem.
 .BR mkfs.minix (8),
 .BR mkfs.msdos (8),
 .BR mkfs.vfat (8),
-.BR mkfs.xfs (8),
-.BR mkfs.xiafs (8)
+.BR mkfs.xfs (8)
 .ad
 .SH AVAILABILITY
 The mkfs command is part of the util-linux package and is available from
diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
index b73e854f33..1acd7ce099 100644
--- a/sys-utils/mount.8
+++ b/sys-utils/mount.8
@@ -2982,11 +2982,6 @@ where failover must not result in clients seeing
 inconsistent namespace presentation during or after a
 failover event.
 
-.SH "Mount options for xiafs"
-None.  Although nothing is wrong with xiafs, it is not used much,
-and is not maintained.  Probably one shouldn't use it.
-Since Linux version 2.1.21 xiafs is no longer part of the kernel source.
-
 .SH "THE LOOP DEVICE"
 One further possible type is a mount via the loop device.  For example,
 the command