On Wed, Oct 07, 2020 at 12:07:04AM +0200, Anthony Iliopoulos wrote:
> 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@xxxxxxxx>
<giggle> :)
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> doc/files.obj | 2 +-
> doc/xfsdump.html | 1 -
> dump/content.c | 3 ---
> dump/inomap.c | 3 ---
> restore/content.c | 8 --------
> 5 files changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/doc/files.obj b/doc/files.obj
> index 4f4653ac56fc..098620e356da 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 9d06129a5e1d..958bc8055bef 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 7637fe89609e..75b79220daf6 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 85f76df606a9..85d61c353cf0 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 6b22965bd894..97f821322960 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;
> --
> 2.28.0
>
