From 1bdd986b214969d1340dbb1bc147d4dc330cfae8 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 9 Mar 2005 14:06:56 +0000 Subject: [PATCH] Install a stripped down without lots of libxfs.h baggage. Merge of master-melb:xfs-cmds:21775a by kenmcd. --- include/Makefile | 4 ++-- include/builddefs.in | 6 +++--- include/xfs.h | 39 +++++++++++++++++++++++++++++++++++++++ include/xqm.h | 6 +++--- libxfs/Makefile | 6 ++++-- man/man3/xfsctl.3 | 2 +- 6 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 include/xfs.h diff --git a/include/Makefile b/include/Makefile index 70d97cdd2..be824d15f 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as @@ -44,7 +44,7 @@ HFILES = handle.h jdm.h libxfs.h libxlog.h swab.h xqm.h \ xfs_log.h xfs_log_priv.h xfs_log_recover.h xfs_mount.h xfs_quota.h \ xfs_rtalloc.h xfs_sb.h xfs_trans.h xfs_trans_space.h xfs_types.h -HFILES += $(PKG_PLATFORM).h +HFILES += $(PKG_PLATFORM).h xfs.h PHFILES = darwin.h freebsd.h irix.h linux.h DKHFILES = volume.h fstyp.h dvh.h LSRCFILES = $(shell echo $(PHFILES) | sed -e "s/$(PKG_PLATFORM).h//g") diff --git a/include/builddefs.in b/include/builddefs.in index ea27618da..f850d5901 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -1,5 +1,5 @@ # -# Copyright (c) 2004 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2004-2005 Silicon Graphics, Inc. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as @@ -117,8 +117,8 @@ GCFLAGS = -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -# Global, Platform, Local CFLAGS -CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) +# First, Global, Platform, Local CFLAGS +CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) include $(TOPDIR)/include/buildmacros diff --git a/include/xfs.h b/include/xfs.h new file mode 100644 index 000000000..147a5a0d0 --- /dev/null +++ b/include/xfs.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2005 Silicon Graphics, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2.1 of the GNU Lesser General Public License + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Further, this software is distributed without any warranty that it is + * free of the rightful claim of any third person regarding infringement + * or the like. Any license provided herein, whether implied or + * otherwise, applies only to this software file. Patent licenses, if + * any, provided herein do not apply to combinations of this program with + * other software, or any other product whatsoever. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, + * USA. + * + * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, + * Mountain View, CA 94043, or: + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * + * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ + */ +#ifndef __XFS_H__ +#define __XFS_H__ + +#include +#include + +#endif /* __XFS_H__ */ diff --git a/include/xqm.h b/include/xqm.h index 0720818f4..5e64bffb5 100644 --- a/include/xqm.h +++ b/include/xqm.h @@ -33,7 +33,7 @@ #ifndef __XQM_H__ #define __XQM_H__ -#include +#include /* * Disk quota - quotactl(2) commands for the XFS Quota Manager (XQM). @@ -124,8 +124,8 @@ typedef struct fs_disk_quota { #define XFS_QUOTA_UDQ_ENFD (1<<1) /* user quota limits enforcement */ #define XFS_QUOTA_GDQ_ACCT (1<<2) /* group quota accounting */ #define XFS_QUOTA_GDQ_ENFD (1<<3) /* group quota limits enforcement */ -#define XFS_QUOTA_PDQ_ACCT (1<<2) /* project quota accounting */ -#define XFS_QUOTA_PDQ_ENFD (1<<3) /* project quota limits enforcement */ +#define XFS_QUOTA_PDQ_ACCT (1<<4) /* project quota accounting */ +#define XFS_QUOTA_PDQ_ENFD (1<<5) /* project quota limits enforcement */ #define XFS_USER_QUOTA (1<<0) /* user quota type */ #define XFS_PROJ_QUOTA (1<<1) /* project quota type */ diff --git a/libxfs/Makefile b/libxfs/Makefile index 4bb6839eb..689fd6fa0 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as @@ -58,7 +58,9 @@ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g") # -DLI_DEBUG log item (ino/buf) manipulation # -DXACT_DEBUG transaction state changes # -LCFLAGS += -I. +#LCFLAGS += + +FCFLAGS = -I. # don't try linking xfs_repair with a debug libxfs. DEBUG = -DNDEBUG diff --git a/man/man3/xfsctl.3 b/man/man3/xfsctl.3 index 154529b28..fb875d839 100644 --- a/man/man3/xfsctl.3 +++ b/man/man3/xfsctl.3 @@ -3,7 +3,7 @@ xfsctl \- control XFS filesystems and individual files .SH C SYNOPSIS .nf -.B #include +.B #include .PP .B "int xfsctl (const char *path, int fd, int cmd, void *ptr); .PP -- 2.47.2