summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-09-18 03:53:14 +0000
committerAndrew Tridgell <tridge@samba.org>1998-09-18 03:53:14 +0000
commitd1a82e643b2e75db8e0c5afa7280ca383917ba64 (patch)
tree3acd5efe87d22fd47c19e4d4ad657fef12e44d52
parentc7da9992cb39fc84a6a915dd2158beaf5e616617 (diff)
downloadsamba-d1a82e643b2e75db8e0c5afa7280ca383917ba64.tar.gz
samba-d1a82e643b2e75db8e0c5afa7280ca383917ba64.tar.bz2
samba-d1a82e643b2e75db8e0c5afa7280ca383917ba64.zip
got rid of SMB_STRUCT_STATVFS. I don't think we should be defining
structures that only apply on some platforms. (This used to be commit 926591067cd8646426ca06df0b00a1d6f6dd5752)
-rw-r--r--source3/include/includes.h17
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/system.c15
-rw-r--r--source3/smbd/dfree.c10
4 files changed, 7 insertions, 36 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9b6e6266dc..62c044603d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -385,23 +385,6 @@
#endif
/*
- * Type for statvfs structure.
- * Unfortunately, due to the make proto structure
- * we still need to define this as void * for platforms
- * that don't have either statvfs or statvfs64. JRA.
- */
-
-#ifndef SMB_STRUCT_STATVFS
-# if defined(STAT_STATVFS64)
-# define SMB_STRUCT_STATVFS struct statvfs64
-# elif defined(STAT_STATVFS)
-# define SMB_STRUCT_STATVFS struct statvfs
-# else
-# define SMB_STRUCT_STATVFS void *
-# endif
-#endif
-
-/*
* Defines for 64 bit fcntl locks.
*/
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d19188f8ef..0df682c4e3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -158,7 +158,6 @@ int sys_select(int maxfd, fd_set *fds,struct timeval *tval);
int sys_stat(char *fname,SMB_STRUCT_STAT *sbuf);
int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf);
int sys_lstat(char *fname,SMB_STRUCT_STAT *sbuf);
-int sys_statvfs( const char *path, SMB_STRUCT_STATVFS *fsd);
int sys_ftruncate(int fd, SMB_OFF_T offset);
SMB_OFF_T sys_lseek(int fd, SMB_OFF_T offset, int whence);
int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence);
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 52be504c52..c3d97e0350 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -179,21 +179,6 @@ int sys_lstat(char *fname,SMB_STRUCT_STAT *sbuf)
}
/*******************************************************************
- An statvfs() wrapper that will deal with 64 bit filesizes.
-********************************************************************/
-
-int sys_statvfs( const char *path, SMB_STRUCT_STATVFS *fsd)
-{
-#if defined(STAT_STATVFS64)
- return statvfs64(path, fsd);
-#elif defined(STAT_STATVFS)
- return statvfs(path, fsd);
-#else
- return -1;
-#endif
-}
-
-/*******************************************************************
An ftruncate() wrapper that will deal with 64 bit filesizes.
********************************************************************/
diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index 499d089260..c96a599e77 100644
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -156,10 +156,14 @@ static int fsusage(const char *path, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
# define CONVERT_BLOCKS(B) \
adjust_blocks ((SMB_BIG_UINT)(B), fsd.f_frsize ? (SMB_BIG_UINT)fsd.f_frsize : (SMB_BIG_UINT)fsd.f_bsize, (SMB_BIG_UINT)512)
- SMB_STRUCT_STATVFS fsd;
+#ifdef STAT_STATVFS64
+ struct statvfs64 fsd;
+ if (statvfs64(path, &fsd) < 0) return -1;
+#else
+ struct statvfs fsd;
+ if (statvfs(path, &fsd) < 0) return -1;
+#endif
- if (sys_statvfs (path, &fsd) < 0)
- return -1;
/* f_frsize isn't guaranteed to be supported. */
#endif /* STAT_STATVFS */