Fix non-portability in xentrace
PATCH 1/1 Fix non-portability in xentrace
# HG changeset patch
# User [email protected]
# Date 1204123693 28800
# Node ID 77ea7611d2c51c65a13736a46427ec401721f187 # Parent c8be63feb437ce500fc2c200c816316c1bd0d12b Fix non-portability in xentrace
Replace statfs() with the equivalent statvfs(), and correct the block size multiplier.
Signed-off-by John Levon <[email protected]>
tools/xentrace/xentrace.c +4 -4
@@ -15,7 +15,6 @@#include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> -#include <sys/vfs.h> #include <fcntl.h> #include <unistd.h> #include <errno.h>
@@ -25,6 +24,7 @@#include <getopt.h> #include <assert.h> #include <sys/poll.h> +#include <sys/statvfs.h> #include <xen/xen.h> #include <xen/trace.h>
@@ -87,7 +87,7 @@ void write_buffer(unsigned int cpu, unsivoid write_buffer (unsigned int cpu,unsigned char *start,int size,int total_size,int outfd) { -struct statfs stat; +struct statvfs stat;size_t written =0 ;if ( opts.disk_rsvd !=0 )
@@ -95,13 +95,13 @@ void write_buffer(unsigned int cpu, unsiunsigned long long freespace;/* Check that filesystem has enough space. */ -if (fstatfs (outfd, &stat) ) +if (fstatvfs (outfd, &stat) ) {fprintf (stderr,"Statfs failed!\n" ); goto fail; } - freespace = stat.f_bsize * (unsigned long long )stat.f_bfree; + freespace = stat.f_frsize * (unsigned long long )stat.f_bfree;if ( total_size ) freespace -= total_size;