From: Steve Lord <lord@sgi.com>
Date: Fri, 3 Oct 2003 14:40:38 +0000 (+0000)
Subject: remove some dead code, update header file from kernel copy
X-Git-Tag: v2.6.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b136f37f26531303a3768a887542742ca11374f;p=thirdparty%2Fxfsprogs-dev.git

remove some dead code, update header file from kernel copy
remove unused macros
---

diff --git a/include/fstyp.h b/include/fstyp.h
index a4668a06b..69ddf72ba 100644
--- a/include/fstyp.h
+++ b/include/fstyp.h
@@ -36,16 +36,6 @@
 extern "C" {
 #endif
 
-/*
- * Compatibility macros for IRIX fstyp.h, in case anyone needs them.
- */
-#define FSTYPSZ		16	/* max size of fs identifier */
-/* Opcodes for the sysfs() system call. */
-#define GETFSIND	1	/* translate fs identifier to fstype index */
-#define GETFSTYP	2	/* translate fstype index to fs identifier */
-#define GETNFSTYP	3	/* return the number of fstypes */
-extern int sysfs (int, ...);
-
 /*
  * fstype allows the user to determine the filesystem identifier of
  * mounted or unmounted filesystems, using heuristics.
diff --git a/include/xfs_dinode.h b/include/xfs_dinode.h
index 86968706b..69a2ca652 100644
--- a/include/xfs_dinode.h
+++ b/include/xfs_dinode.h
@@ -439,25 +439,21 @@ void xfs_dfork_next_set(xfs_dinode_t *dip, int w, int n);
 /*
  * File types (mode field)
  */
-#define	IFMT		0170000		/* type of file */
-#define	IFIFO		0010000		/* named pipe (fifo) */
-#define	IFCHR		0020000		/* character special */
-#define	IFDIR		0040000		/* directory */
-#define	IFBLK		0060000		/* block special */
-#define	IFREG		0100000		/* regular */
-#define	IFLNK		0120000		/* symbolic link */
-#define	IFSOCK		0140000		/* socket */
-#define	IFMNT		0160000		/* mount point */
-
-/*
- * File execution and access modes.
- */
-#define	ISUID		04000		/* set user id on execution */
-#define	ISGID		02000		/* set group id on execution */
-#define	ISVTX		01000		/* sticky directory */
-#define	IREAD		0400		/* read, write, execute permissions */
-#define	IWRITE		0200
-#define	IEXEC		0100
+#define	IFMT		S_IFMT
+#define	IFSOCK		S_IFSOCK
+#define	IFLNK		S_IFLNK
+#define	IFREG		S_IFREG
+#define	IFBLK		S_IFBLK
+#define	IFDIR		S_IFDIR
+#define	IFCHR		S_IFCHR
+#define	IFIFO		S_IFIFO
+
+#define	ISUID		S_ISUID
+#define	ISGID		S_ISGID
+#define	ISVTX		S_ISVTX
+#define	IREAD		S_IRUSR
+#define	IWRITE		S_IWUSR
+#define	IEXEC		S_IXUSR
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_DINODE)
 xfs_dinode_t *xfs_buf_to_dinode(struct xfs_buf *bp);
diff --git a/repair/dinode.c b/repair/dinode.c
index 79ccbee45..c42cba09e 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1981,9 +1981,6 @@ process_dinode_int(xfs_mount_t *mp,
 	case IFIFO:
 		type = XR_INO_FIFO;
 		break;
-	case IFMNT:
-		type = XR_INO_MOUNTPOINT;
-		break;
 	default:
 		type = XR_INO_UNKNOWN;
 		do_warn(_("Unexpected inode type %#o inode %llu\n"),