diff options
| author | Nathan Scott <nathans@sgi.com> | 2002-09-03 02:15:45 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2002-09-03 02:15:45 +0000 |
| commit | 71f0520f69830083b8908c5d0b69de742533f20f (patch) | |
| tree | 6330c0c1105ff76348750a98b0debb4334e53d9f /common | |
| parent | 7e63def01c3328be22f441adad42f43e630c0fdd (diff) | |
| download | xfsdump-dev-71f0520f69830083b8908c5d0b69de742533f20f.tar.gz | |
do some additional cleanup after autoconf has run.
Diffstat (limited to 'common')
| -rw-r--r-- | common/fs.c | 5 | ||||
| -rw-r--r-- | common/util.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/common/fs.c b/common/fs.c index 5bca2a78..afd97218 100644 --- a/common/fs.c +++ b/common/fs.c @@ -32,6 +32,7 @@ #include <libxfs.h> #include <jdm.h> +#include "config.h" #include <sys/stat.h> #include <sys/statvfs.h> @@ -212,7 +213,7 @@ fs_mounted( char *typs, char *chrs, char *mnts, uuid_t *idp ) intgen_t fs_getid( char *mnts, uuid_t *idb ) { - xfs_fsop_geom_t geo; + xfs_fsop_geom_v1_t geo; int fd; fd = open( mnts, O_RDONLY ); @@ -220,7 +221,7 @@ fs_getid( char *mnts, uuid_t *idb ) uuid_clear( *idb ); return -1; } - if ( ioctl(fd, XFS_IOC_FSGEOMETRY, &geo ) ) { + if ( ioctl(fd, XFS_IOC_FSGEOMETRY_V1, &geo ) ) { uuid_clear( *idb ); close(fd); return -1; diff --git a/common/util.c b/common/util.c index d514c654..67c03047 100644 --- a/common/util.c +++ b/common/util.c @@ -32,6 +32,7 @@ #include <libxfs.h> #include <jdm.h> +#include "config.h" #include <sys/stat.h> #include <sys/ioctl.h> @@ -532,7 +533,7 @@ bool_t isinxfs( char *path ) { intgen_t fd; - xfs_fsop_geom_t geo; + xfs_fsop_geom_v1_t geo; intgen_t rval; fd = open( path, O_RDONLY ); @@ -543,7 +544,7 @@ isinxfs( char *path ) path ); return BOOL_FALSE; } - rval = ioctl(fd, XFS_IOC_FSGEOMETRY, &geo); + rval = ioctl(fd, XFS_IOC_FSGEOMETRY_V1, &geo); if ( rval < 0 ) { return BOOL_FALSE; |