From: Nathan Scott <nathans@sgi.com>
Date: Fri, 24 Aug 2001 01:57:46 +0000 (+0000)
Subject: fix with benign change in the kernel header.
X-Git-Tag: v2.0.0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=275ae71f106dc25698ad293346f9c9fe2fe3a804;p=thirdparty%2Fxfsprogs-dev.git

fix with benign change in the kernel header.
---

diff --git a/include/xqm.h b/include/xqm.h
index 07b9181d4..eeea83a11 100644
--- a/include/xqm.h
+++ b/include/xqm.h
@@ -29,23 +29,26 @@
  *
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
-#ifndef __XQM_H__
-#define __XQM_H__
+#ifndef _LINUX_XQM_H
+#define _LINUX_XQM_H
 
 #include <linux/types.h>
-
-#define XQM_CMD(cmd)	( ('X'<<8)+(cmd) )
-#define IS_XQM_CMD(cmd)	( ((int)(cmd)>>8) == 'X' )
+#include <linux/quota.h>
 
 /*
- * Disk quota - quotactl(2) commands for XFS Quota Manager (XQM).
+ * Disk quota - quotactl(2) commands for the XFS Quota Manager (XQM).
  */
-#define Q_XQUOTAON   XQM_CMD(0x1)  /* enable quota accounting/enforcement */
-#define Q_XQUOTAOFF  XQM_CMD(0x2)  /* disable quota accounting/enforcement */
-#define Q_XGETQUOTA  XQM_CMD(0x3)  /* get disk limits & usage */
-#define Q_XSETQLIM   XQM_CMD(0x4)  /* set disk limits only */
-#define Q_XGETQSTAT  XQM_CMD(0x5)  /* returns fs_quota_stat_t struct */
-#define Q_XQUOTARM   XQM_CMD(0x6)  /* free quota files' space */
+
+#ifndef XQM_CMD	/* may have been defined in <linux/quota.h> already */
+#define XQM_CMD(x)     ( ('X'<<8)+(x) )	/* note: forms first QCMD argument */
+#define IS_XQM_CMD(x)  ( ((int)(x)>>8) == 'X' )
+#define Q_XQUOTAON     XQM_CMD(0x1)	/* enable accounting/enforcement */
+#define Q_XQUOTAOFF    XQM_CMD(0x2)	/* disable accounting/enforcement */
+#define Q_XGETQUOTA    XQM_CMD(0x3)	/* get disk limits and usage */
+#define Q_XSETQLIM     XQM_CMD(0x4)	/* set disk limits */
+#define Q_XGETQSTAT    XQM_CMD(0x5)	/* get quota subsystem status */
+#define Q_XQUOTARM     XQM_CMD(0x6)	/* free disk space used by dquots */
+#endif /* XQM_CMD */
 
 /*
  * fs_disk_quota structure:
@@ -156,4 +159,4 @@ typedef struct fs_quota_stat {
 	__u16		qs_iwarnlimit;	/* limit for num warnings */
 } fs_quota_stat_t;
 
-#endif	/* __XQM_H__ */
+#endif	/* _LINUX_XQM_H */
diff --git a/libxfs/xfs_dir_leaf.c b/libxfs/xfs_dir_leaf.c
index fd5c9d671..55834e79e 100644
--- a/libxfs/xfs_dir_leaf.c
+++ b/libxfs/xfs_dir_leaf.c
@@ -158,7 +158,7 @@ xfs_dir_shortform_removename(xfs_da_args_t *args)
 {
 	xfs_dir_shortform_t *sf;
 	xfs_dir_sf_entry_t *sfe;
-	int base, size, i;
+	int base, size = 0, i;
 	xfs_inode_t *dp;
 
 	dp = args->dp;
diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 59dffcdcb..55a4ee448 100644
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -355,7 +355,7 @@ xfs_ialloc_ag_select(
 	xfs_agnumber_t	agno;		/* current ag number */
 	int		flags;		/* alloc buffer locking flags */
 	xfs_extlen_t	ineed;		/* blocks needed for inode allocation */
-	xfs_extlen_t	longest;	/* longest extent available */
+	xfs_extlen_t	longest = 0;	/* longest extent available */
 	xfs_mount_t	*mp;		/* mount point structure */
 	int		needspace;	/* file mode implies space allocated */
 	xfs_perag_t	*pag;		/* per allocation group data */