From 1d132b531b294e77e459d17e4893d7bbf73f1bb7 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@sgi.com>
Date: Wed, 6 Nov 2002 22:08:16 +0100
Subject: [PATCH] [XFS] remove nopkg() alias for ENOSYS

SGI Modid: 2.5.x-xfs:slinx:130598a
---
 fs/xfs/linux/xfs_linux.h | 2 --
 fs/xfs/xfs_dmapi.h       | 6 +++---
 fs/xfs/xfs_log_recover.c | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/fs/xfs/linux/xfs_linux.h b/fs/xfs/linux/xfs_linux.h
index 6ce17277ed88..d068e9a7f7a7 100644
--- a/fs/xfs/linux/xfs_linux.h
+++ b/fs/xfs/linux/xfs_linux.h
@@ -155,8 +155,6 @@ typedef struct xfs_dirent {		/* data from readdir() */
 #define SYNCHRONIZE()	barrier()
 #define rootdev		ROOT_DEV
 #define __return_address __builtin_return_address(0)
-#define LONGLONG_MAX	9223372036854775807LL	/* max "long long int" */
-#define nopkg()		( ENOSYS )
 
 /* IRIX uses a dynamic sizing algorithm (ndquot = 200 + numprocs*2) */
 /* we may well need to fine-tune this if it ever becomes an issue.  */
diff --git a/fs/xfs/xfs_dmapi.h b/fs/xfs/xfs_dmapi.h
index dbfff6f70ad9..edf08597d8e4 100644
--- a/fs/xfs/xfs_dmapi.h
+++ b/fs/xfs/xfs_dmapi.h
@@ -268,7 +268,7 @@ xfs_dm_send_data_event(
 	int		flags,
 	vrwlock_t	*locktype)
 {
-	return nopkg();
+	return ENOSYS;
 }
 
 static __inline int
@@ -288,7 +288,7 @@ dm_send_destroy_event(
 	bhv_desc_t	*bdp,
 	dm_right_t	vp_right)
 {
-	return nopkg();
+	return ENOSYS;
 }
 
 static __inline int
@@ -304,7 +304,7 @@ dm_send_namesp_event(
 	int		retcode,
 	int		flags)
 {
-	return nopkg();
+	return ENOSYS;
 }
 
 static __inline void
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 125af631e3f2..b01d968eaf01 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1802,7 +1802,7 @@ xlog_recover_do_reg_buffer(xfs_mount_t		*mp,
 		 */
 		error = 0;
 		if (buf_f->blf_flags & (XFS_BLI_UDQUOT_BUF|XFS_BLI_GDQUOT_BUF)) {
-			/* OK, if this returns nopkg() */
+			/* OK, if this returns ENOSYS */
 			error = xfs_qm_dqcheck((xfs_disk_dquot_t *)
 					       item->ri_buf[i].i_addr,
 					       -1, 0, XFS_QMOPT_DOWARN,
@@ -2315,7 +2315,7 @@ xlog_recover_do_dquot_trans(xlog_t		*log,
 	 * of looking at the SB quota bits.
 	 *
 	 * The other possibility, of course, is that the quota subsystem was
-	 * removed since the last mount - nopkg().
+	 * removed since the last mount - ENOSYS.
 	 */
 	dq_f = (xfs_dq_logformat_t *)item->ri_buf[0].i_addr;
 	ASSERT(dq_f);
@@ -2323,7 +2323,7 @@ xlog_recover_do_dquot_trans(xlog_t		*log,
 			   dq_f->qlf_id,
 			   0, XFS_QMOPT_DOWARN,
 			   "xlog_recover_do_dquot_trans (log copy)"))) {
-	  if ((error == nopkg()))
+	  if (error == ENOSYS)
 			return (0);
 		return XFS_ERROR(EIO);
 	}
-- 
2.39.5