libdm touch-ups

place dmapi.h in /usr/include/xfs

4 files changed, 17 insertions, 101 deletions

diff --git a/build/rpm/dmapi.spec.in b/build/rpm/dmapi.spec.in
index 936e711..34a614b 100644
--- a/build/rpm/dmapi.spec.in
+++ b/build/rpm/dmapi.spec.in
@@ -28,7 +28,7 @@ Requires: @pkg_name@
 dmapi-devel contains the libraries and header files needed to
 develop programs which make use of the Data Management API
 (DMAPI).  If you install dmapi-devel, you'll also want to install
-the dmapi (runtime) package.
+the dmapi (runtime) package and the xfsprogs-devel package.
 
 # If .census exists, then no setup is necessary, just go and do the build,
 # otherwise run setup
diff --git a/configure.in b/configure.in
index b45bd80..86ff7c7 100644
--- a/configure.in
+++ b/configure.in
@@ -145,7 +145,7 @@ pkg_sbin_dir=${root_prefix}/bin
 AC_SUBST(pkg_sbin_dir)
 
 dnl include files
-pkg_inc_dir=${prefix}/include
+pkg_inc_dir=${prefix}/include/xfs
 AC_SUBST(pkg_inc_dir)
 
 dnl doc directory
diff --git a/debian/control b/debian/control
index 843c743..404991d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,10 @@ Description: Data Management API runtime environment
 Package: dmapi-dev
 Section: devel
 Priority: extra
-Depends: libc6-dev, dmapi
+Depends: libc6-dev, dmapi, xfslibs-dev
 Architecture: any
 Description: Data Management API static libraries and headers
  dmapi-dev contains the libraries and header files needed to
  develop programs which make use of the Data Management API
- (DMAPI).
+ (DMAPI).  You must install the xfslibs-dev package with
+ dmapi-dev.
diff --git a/man/man3/dmapi.3 b/man/man3/dmapi.3
index 1fa9cc8..193bda8 100644
--- a/man/man3/dmapi.3
+++ b/man/man3/dmapi.3
@@ -1,109 +1,24 @@
 .TH DMAPI 3
 .SH NAME
-dmi \- \&DMAPI internal system call wrapper
+dmapi \- \&DMAPI library
 .SH SYNOPSIS
 .nf
-\f3#include <dmapi/dmapi.h>\f1
-\f3#include <dmapi/dmapi_kern.h>\f1
-\f3#include <dmapi/dmapi_lib.h>\f1
+\f3#include <xfs/dmapi.h>\f1
 .sp .8v
-\f3int dmi (int opcode, ...);\f1
+\f3cc ... -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -ldm -lhandle
 .fi
 .SH DESCRIPTION
-\f2dmi\f1 is a system interface used to implement the interface
-defined in the X/Open document:
+\f2DMAPI\f1, or \f2XDSM\f1, is an implementation of
+the X/Open document:
 \f3Systems Management: Data Storage Management (XDSM) API\f1
 dated February 1997.
-This interface is made available on Silicon Graphics systems 
+This interface is made available for the XFS filesystem
 by means of the \f3libdm\f1 library.
 .PP
-The value of the \f2opcode\f1 parameter determines the meaning
-of the remaining arguments.
-These are all interfaces that are used
-to implement various \f2libdm\fP functions.
-The only filesystem that supports these operations is XFS.
-They are all subject to change,
-should not be called
-directly by applications,
-and are not described further.
-The valid opcodes are:
-.PD
+See the XDSM manual at
+http://www.opengroup.org/onlinepubs/9657099/toc.htm for a
+description of the functions offered by libdm library.
 .PP
-.nf
-.B DM_CLEAR_INHERIT
-.B DM_CREATE_BY_HANDLE
-.B DM_CREATE_SESSION
-.B DM_CREATE_USEREVENT
-.B DM_DESTROY_SESSION
-.B DM_DOWNGRADE_RIGHT
-.B DM_FD_TO_HANDLE
-.B DM_FIND_EVENTMSG
-.B DM_GET_ALLOCINFO
-.B DM_GET_BULKALL
-.B DM_GET_BULKATTR
-.B DM_GET_CONFIG
-.B DM_GET_CONFIG_EVENTS
-.B DM_GET_DIOINFO
-.B DM_GET_DIRATTRS
-.B DM_GET_DMATTR
-.B DM_GET_EVENTLIST
-.B DM_GET_EVENTS
-.B DM_GET_FILEATTR
-.B DM_GET_MOUNTINFO
-.B DM_GET_REGION
-.B DM_GETALL_DISP
-.B DM_GETALL_DMATTR
-.B DM_GETALL_INHERIT
-.B DM_GETALL_SESSIONS
-.B DM_GETALL_TOKENS
-.B DM_INIT_ATTRLOC
-.B DM_MKDIR_BY_HANDLE
-.B DM_MOVE_EVENT
-.B DM_OBJ_REF_HOLD
-.B DM_OBJ_REF_QUERY
-.B DM_OBJ_REF_RELE
-.B DM_PATH_TO_FSHANDLE
-.B DM_PATH_TO_HANDLE
-.B DM_PENDING
-.B DM_PROBE_HOLE
-.B DM_PUNCH_HOLE
-.B DM_QUERY_RIGHT
-.B DM_QUERY_SESSION
-.B DM_READ_INVIS
-.B DM_RELEASE_RIGHT
-.B DM_REMOVE_DMATTR
-.B DM_REQUEST_RIGHT
-.B DM_RESPOND_EVENT
-.B DM_SEND_MSG
-.B DM_SET_DISP
-.B DM_SET_DMATTR
-.B DM_SET_EVENTLIST
-.B DM_SET_FILEATTR
-.B DM_SET_INHERIT
-.B DM_SET_REGION
-.B DM_SET_RETURN_ON_DESTROY
-.B DM_SYMLINK_BY_HANDLE
-.B DM_SYNC_BY_HANDLE
-.B DM_UPGRADE_RIGHT
-.B DM_WRITE_INVIS
-.fi
-.sp .8v
-.SH ERRORS
-The following error codes may be returned by
-.IR dmi :
-.TP 12
-\&[EFAULT\&]
-A buffer is referenced which is not in a valid part of the calling program's
-address space.
-.TP
-\&[EPERM\&]
-The effective user ID is not superuser.
-.TP
-\&[EINVAL\&]
-An invalid parameter or parameter combination was specified.
-.SH "DIAGNOSTICS"
-Upon successful completion, a command dependent value (default of zero) is
-returned.
-Otherwise, a value of \-1 is returned and
-\f2errno\f1
-is set to indicate the error.
+For more information and details on how to contribute to the
+XFS project see the web pages at:
+http://oss.sgi.com/projects/xfs/