[Libsysio-commit] HEAD: libsysio/include dev.h fs.h inode.h native.h sysio-cmn.h sysio.h
Brought to you by:
lward
Menu
▾
▴
[Libsysio-commit] HEAD: libsysio/include dev.h fs.h inode.h native.h sysio-cmn.h sysio.h
|
From: Lee W. <lw...@us...> - 2007-04-30 23:24:16
|
Update of /cvsroot/libsysio/libsysio/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2987/include Modified Files: dev.h fs.h inode.h native.h sysio-cmn.h sysio.h Log Message: Restore support of statvfs{,64}. Index: dev.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/dev.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -b -B -p -r1.10 -r1.11 --- dev.h 4 Aug 2005 20:17:10 -0000 1.10 +++ dev.h 30 Apr 2007 23:24:12 -0000 1.11 @@ -136,12 +136,10 @@ extern const struct inode_ops _sysio_nod (int (*)(struct pnode *, \ mode_t, \ dev_t))_sysio_do_illop -#ifdef _HAVE_STATVFS #define _sysio_nodev_inop_statvfs \ (int (*)(struct pnode *, \ struct inode *, \ struct intnl_statvfs *))_sysio_do_illop -#endif #define _sysio_nodev_inop_gone \ (void (*)(struct inode *ino))_sysio_do_noop Index: fs.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/fs.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -b -B -p -r1.5 -r1.6 --- fs.h 6 Feb 2004 20:07:29 -0000 1.5 +++ fs.h 30 Apr 2007 23:24:12 -0000 1.6 @@ -117,7 +117,7 @@ struct filesys { void *fs_private; /* driver data */ struct itable_entry fs_itbl[FS_ITBLSIZ]; /* inodes hash */ unsigned long fs_id; /* ID */ - size_t fs_bsize; /* block size */ + size_t fs_bsize; /* DEPRECATED */ }; #define FS_F_RO 0x01 /* read-only */ Index: inode.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/inode.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -b -B -p -r1.28 -r1.29 --- inode.h 30 Apr 2007 16:52:20 -0000 1.28 +++ inode.h 30 Apr 2007 23:24:13 -0000 1.29 @@ -63,9 +63,7 @@ struct inode; struct intent; struct intnl_dirent; struct intnl_stat; -#ifdef _HAVE_STATVFS struct intnl_statvfs; -#endif struct io_arguments; struct ioctx; @@ -108,11 +106,9 @@ struct inode_ops { int (*inop_datasync)(struct inode *ino); int (*inop_ioctl)(struct inode *ino, unsigned long int request, va_list ap); int (*inop_mknod)(struct pnode *pno, mode_t mode, dev_t dev); -#ifdef _HAVE_STATVFS int (*inop_statvfs)(struct pnode *pno, struct inode *ino, struct intnl_statvfs *buf); -#endif void (*inop_gone)(struct inode *ino); }; @@ -343,10 +339,8 @@ struct pnode { _PNOP_CALL((_pno), ioctl, (_pno)->p_base->pb_ino, (_request), (_ap)) #define PNOP_MKNOD(_pno, _mode, _dev) \ _PNOP_MKCALL((_pno), mknod, (_pno), (_mode), (_dev)) -#ifdef _HAVE_STATVFS #define PNOP_STATVFS(_pno, _buf) \ _PNOP_CALL((_pno), statvfs, (_pno), (_pno)->p_base->pb_ino, (_buf)) -#endif #define PNOP_GONE(_pno) \ _PNOP_CALL((_pno), gone, (_pno)->p_base->pb_ino) Index: native.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/native.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -b -B -p -r1.2 -r1.3 --- native.h 14 Oct 2004 14:59:28 -0000 1.2 +++ native.h 30 Apr 2007 23:24:13 -0000 1.3 @@ -220,6 +220,13 @@ do { #if defined(SYS_utime) #define SYSIO_SYS_utime SYS_utime #endif +#if _LARGEFILE64_SOURCE && defined(SYS_statfs64) +#define SYSIO_SYS_statfs SYS_statfs64 +#define SYSIO_SYS_fstatfs SYS_fstatfs64 +#elif defined(SYS_statfs) +#define SYSIO_SYS_statfs SYS_statfs +#define SYSIO_SYS_fstatfs SYS_fstatfs +#endif #if defined(SYS_socketcall) #define SYSIO_SYS_socketcall SYS_socketcall #endif Index: sysio-cmn.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/sysio-cmn.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -w -b -B -p -r1.13 -r1.14 --- sysio-cmn.h 30 Apr 2007 16:52:20 -0000 1.13 +++ sysio-cmn.h 30 Apr 2007 23:24:13 -0000 1.14 @@ -198,6 +198,10 @@ typedef enum { _SYSIO_TTAG(rmdir), _SYSIO_TTAG(xstatnd), _SYSIO_TTAG(fxstat), + _SYSIO_TTAG(statvfs64), + _SYSIO_TTAG(fstatvfs64), + _SYSIO_TTAG(statvfs), + _SYSIO_TTAG(fstatvfs), _SYSIO_TTAG(opendir), _SYSIO_TTAG(closedir), _SYSIO_TTAG(symlink), Index: sysio.h =================================================================== RCS file: /cvsroot/libsysio/libsysio/include/sysio.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -w -b -B -p -r1.39 -r1.40 --- sysio.h 2 Jan 2007 20:44:10 -0000 1.39 +++ sysio.h 30 Apr 2007 23:24:13 -0000 1.40 @@ -96,20 +96,17 @@ struct dirent; #endif struct stat; -#ifdef _HAVE_STATVFS #if _LARGEFILE64_SOURCE #define intnl_statvfs statvfs64 #else #define intnl_statvfs statvfs -#define INTNL_STATVFS_IS_NATURAL 1 #endif struct statvfs; -struct intnl_statvfs; -#endif struct utimbuf; struct intnl_stat; +struct intnl_statvfs; struct pnode; @@ -231,7 +228,6 @@ extern ssize_t SYSIO_INTERFACE_NAME(pwri extern ssize_t SYSIO_INTERFACE_NAME(writev)(int fd, const struct iovec *iov, int count); -#ifdef _HAVE_STATVFS extern int SYSIO_INTERFACE_NAME(statvfs)(const char *path, struct statvfs *buf); #if _LARGEFILE64_SOURCE extern int SYSIO_INTERFACE_NAME(statvfs64)(const char *path, @@ -241,7 +237,6 @@ extern int SYSIO_INTERFACE_NAME(fstatvfs #if _LARGEFILE64_SOURCE extern int SYSIO_INTERFACE_NAME(fstatvfs64)(int fd, struct statvfs64 *buf); #endif -#endif extern int SYSIO_INTERFACE_NAME(truncate)(const char *path, off_t length); #if _LARGEFILE64_SOURCE extern int SYSIO_INTERFACE_NAME(truncate64)(const char *path, off64_t length); |
