aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Iliopoulos <ailiop@suse.com>2022-02-03 12:42:30 -0500
committerEric Sandeen <sandeen@sandeen.net>2022-02-03 12:42:30 -0500
commitf8c9cdc4017d4281eaab8930b9144e88d1bf8cc7 (patch)
treef275fb121a7055da8fc95889f19a8f2bfb6420e4
parent15689d8ce87875fbee2b46c899f8fb9f21b0b669 (diff)
downloadxfsdump-dev-f8c9cdc4017d4281eaab8930b9144e88d1bf8cc7.tar.gz
xfsdump: remove obsolete code for handling xenix named pipes
We can safely drop support for XENIX named pipes (S_IFNAM) at this point, since this was never implemented in Linux. Signed-off-by: Anthony Iliopoulos <ailiop@suse.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r--doc/files.obj2
-rw-r--r--doc/xfsdump.html1
-rw-r--r--dump/content.c3
-rw-r--r--dump/inomap.c3
-rw-r--r--restore/content.c8
5 files changed, 1 insertions, 16 deletions
diff --git a/doc/files.obj b/doc/files.obj
index 4f4653ac..098620e3 100644
--- a/doc/files.obj
+++ b/doc/files.obj
@@ -295,7 +295,7 @@ minilines(486,15,0,0,0,0,0,[
mini_line(486,12,3,0,0,0,[
str_block(0,486,12,3,0,-4,0,0,0,[
str_seg('black','Courier',0,80640,486,12,3,0,-4,0,0,0,0,0,
- "Other File (S_IFCHAR|S_IFBLK|S_IFIFO|S_IFNAM|S_IFSOCK)")])
+ "Other File (S_IFCHAR|S_IFBLK|S_IFIFO|S_IFSOCK)")])
])
])]).
text('black',48,244,2,0,1,54,30,379,12,3,0,0,0,0,2,54,30,0,0,"",0,0,0,0,256,'',[
diff --git a/doc/xfsdump.html b/doc/xfsdump.html
index 9d06129a..958bc805 100644
--- a/doc/xfsdump.html
+++ b/doc/xfsdump.html
@@ -100,7 +100,6 @@ or stdout. The dump includes all the filesystem objects of:
<li>character special files (S_IFCHR)
<li>block special files (S_IFBLK)
<li>named pipes (S_FIFO)
-<li>XENIX named pipes (S_IFNAM)
</ul>
It does not dump files from <i>/var/xfsdump</i> which is where the
xfsdump inventory is located.
diff --git a/dump/content.c b/dump/content.c
index 7637fe89..75b79220 100644
--- a/dump/content.c
+++ b/dump/content.c
@@ -3883,9 +3883,6 @@ dump_file(void *arg1,
case S_IFCHR:
case S_IFBLK:
case S_IFIFO:
-#ifdef S_IFNAM
- case S_IFNAM:
-#endif
case S_IFLNK:
case S_IFSOCK:
/* only need a filehdr_t; no data
diff --git a/dump/inomap.c b/dump/inomap.c
index 85f76df6..85d61c35 100644
--- a/dump/inomap.c
+++ b/dump/inomap.c
@@ -1723,9 +1723,6 @@ estimate_dump_space(struct xfs_bstat *statp)
case S_IFIFO:
case S_IFCHR:
case S_IFDIR:
-#ifdef S_IFNAM
- case S_IFNAM:
-#endif
case S_IFBLK:
case S_IFSOCK:
case S_IFLNK:
diff --git a/restore/content.c b/restore/content.c
index 6b22965b..97f82132 100644
--- a/restore/content.c
+++ b/restore/content.c
@@ -7313,9 +7313,6 @@ restore_file_cb(void *cp, bool_t linkpr, char *path1, char *path2)
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
-#ifdef S_IFNAM
- case S_IFNAM:
-#endif
case S_IFSOCK:
ok = restore_spec(fhdrp, rvp, path1);
return ok;
@@ -7797,11 +7794,6 @@ restore_spec(filehdr_t *fhdrp, rv_t *rvp, char *path)
case S_IFIFO:
printstr = _("named pipe");
break;
-#ifdef S_IFNAM
- case S_IFNAM:
- printstr = _("XENIX named pipe");
- break;
-#endif
case S_IFSOCK:
printstr = _("UNIX domain socket");
break;