LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh include/sys/vfs.h

Browse Source 
1. Sync bionic's, remove mips-specific one
2. Fix statfs.c to transfer the new f_flags too
3. Revise comment about --wrap=symbol

Change-Id: If68818e3dcb2a4056cd0b2e100fcfb8b2156c33a
This commit is contained in:
Andrew Hsieh
2013-10-07 15:39:47 +08:00
parent 88a42f9daf
commit 16af6afb9a
5 changed files with 57 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ndk/platforms/android-3/include/sys/vfs.h
View File

@@ -34,7 +34,27 @@
__BEGIN_DECLS __BEGIN_DECLS
/* note: this corresponds to the kernel's statfs64 type */ /* The kernel's __kernel_fsid_t has a 'val' member but glibc uses '__val'. */
typedef struct { int __val[2]; } __fsid_t;
/* Our struct statfs corresponds to the kernel's statfs64 type. */
#ifdef __mips__
struct statfs {
uint32_t f_type;
uint32_t f_bsize;
uint32_t f_frsize;
uint32_t __pad;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_files;
uint64_t f_ffree;
uint64_t f_bavail;
__fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_flags;
uint32_t f_spare[5];
};
#else
struct statfs { struct statfs {
uint32_t f_type; uint32_t f_type;
uint32_t f_bsize; uint32_t f_bsize;
@@ -43,11 +63,13 @@ struct statfs {
uint64_t f_bavail; uint64_t f_bavail;
uint64_t f_files; uint64_t f_files;
uint64_t f_ffree; uint64_t f_ffree;
__kernel_fsid_t f_fsid; __fsid_t f_fsid;
uint32_t f_namelen; uint32_t f_namelen;
uint32_t f_frsize; uint32_t f_frsize;
uint32_t f_spare[5]; uint32_t f_flags;
uint32_t f_spare[4];
}; };
#endif
#define ADFS_SUPER_MAGIC 0xadf5 #define ADFS_SUPER_MAGIC 0xadf5
#define AFFS_SUPER_MAGIC 0xADFF #define AFFS_SUPER_MAGIC 0xADFF

119
ndk/platforms/android-9/arch-mips/include/sys/vfs.h
View File

@@ -1,119 +0,0 @@
/*
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _SYS_VFS_H_
#define _SYS_VFS_H_
#include <stdint.h>
#include <sys/cdefs.h>
#include <sys/types.h>
__BEGIN_DECLS
/* note: this corresponds to the kernel's statfs64 type */
#ifdef __mips__
struct statfs {
uint32_t f_type;
uint32_t f_bsize;
uint32_t f_frsize;
uint32_t __pad;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_files;
uint64_t f_ffree;
uint64_t f_bavail;
__kernel_fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_spare[6];
};
#else
struct statfs {
uint32_t f_type;
uint32_t f_bsize;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_bavail;
uint64_t f_files;
uint64_t f_ffree;
__kernel_fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_frsize;
uint32_t f_spare[5];
};
#endif
#define ADFS_SUPER_MAGIC 0xadf5
#define AFFS_SUPER_MAGIC 0xADFF
#define BEFS_SUPER_MAGIC 0x42465331
#define BFS_MAGIC 0x1BADFACE
#define CIFS_MAGIC_NUMBER 0xFF534D42
#define CODA_SUPER_MAGIC 0x73757245
#define COH_SUPER_MAGIC 0x012FF7B7
#define CRAMFS_MAGIC 0x28cd3d45
#define DEVFS_SUPER_MAGIC 0x1373
#define EFS_SUPER_MAGIC 0x00414A53
#define EXT_SUPER_MAGIC 0x137D
#define EXT2_OLD_SUPER_MAGIC 0xEF51
#define EXT2_SUPER_MAGIC 0xEF53
#define EXT3_SUPER_MAGIC 0xEF53
#define HFS_SUPER_MAGIC 0x4244
#define HPFS_SUPER_MAGIC 0xF995E849
#define HUGETLBFS_MAGIC 0x958458f6
#define ISOFS_SUPER_MAGIC 0x9660
#define JFFS2_SUPER_MAGIC 0x72b6
#define JFS_SUPER_MAGIC 0x3153464a
#define MINIX_SUPER_MAGIC 0x137F /* orig. minix */
#define MINIX_SUPER_MAGIC2 0x138F /* 30 char minix */
#define MINIX2_SUPER_MAGIC 0x2468 /* minix V2 */
#define MINIX2_SUPER_MAGIC2 0x2478 /* minix V2, 30 char names */
#define MSDOS_SUPER_MAGIC 0x4d44
#define NCP_SUPER_MAGIC 0x564c
#define NFS_SUPER_MAGIC 0x6969
#define NTFS_SB_MAGIC 0x5346544e
#define OPENPROM_SUPER_MAGIC 0x9fa1
#define PROC_SUPER_MAGIC 0x9fa0
#define QNX4_SUPER_MAGIC 0x002f
#define REISERFS_SUPER_MAGIC 0x52654973
#define ROMFS_MAGIC 0x7275
#define SMB_SUPER_MAGIC 0x517B
#define SYSV2_SUPER_MAGIC 0x012FF7B6
#define SYSV4_SUPER_MAGIC 0x012FF7B5
#define TMPFS_MAGIC 0x01021994
#define UDF_SUPER_MAGIC 0x15013346
#define UFS_MAGIC 0x00011954
#define USBDEVICE_SUPER_MAGIC 0x9fa2
#define VXFS_SUPER_MAGIC 0xa501FCF5
#define XENIX_SUPER_MAGIC 0x012FF7B4
#define XFS_SUPER_MAGIC 0x58465342
#define _XIAFS_SUPER_MAGIC 0x012FD16D
extern int statfs(const char *, struct statfs *);
extern int fstatfs(int, struct statfs *);
__END_DECLS
#endif /* _SYS_VFS_H_ */

1
ndk/sources/android/libportable/arch-mips/statfs.c
View File

@@ -33,6 +33,7 @@ static inline void statfs_ntop(struct statfs *n_statfs, struct statfs_portable *
p_statfs->f_fsid = n_statfs->f_fsid; p_statfs->f_fsid = n_statfs->f_fsid;
p_statfs->f_namelen = n_statfs->f_namelen; p_statfs->f_namelen = n_statfs->f_namelen;
p_statfs->f_frsize = n_statfs->f_frsize; p_statfs->f_frsize = n_statfs->f_frsize;
p_statfs->f_flags = n_statfs->f_flags;
} }
int WRAP(statfs)(const char* path, struct statfs_portable* stat) int WRAP(statfs)(const char* path, struct statfs_portable* stat)

4
ndk/sources/android/libportable/common/include/asm-generic/portability.h
View File

@@ -21,8 +21,8 @@
#define WRAP(f) f ## _portable #define WRAP(f) f ## _portable
#define REAL(f) f #define REAL(f) f
#else #else
/* On host app link with libpportable.a with -Wl,--wrap=symbol, which resolve symbol symbol to __wrap_symbol, /* On host app link with libpportable.a with -Wl,--wrap=symbol, which resolves undefined symbol to __wrap_symbol,
* and __real_symbol refer to the original symbol * and undefined __real_symbol to the original symbol
*/ */
#define WRAP(f) __wrap_ ## f #define WRAP(f) __wrap_ ## f
#define REAL(f) __real_ ## f #define REAL(f) __real_ ## f

20
ndk/sources/android/libportable/common/include/statfs_portable.h
View File

@@ -31,6 +31,26 @@ struct statfs_portable {
__fsid_t f_fsid; __fsid_t f_fsid;
uint32_t f_namelen; uint32_t f_namelen;
uint32_t f_frsize; uint32_t f_frsize;
uint32_t f_flags;
uint32_t f_spare[4];
};
/*
The MIPS Version is
struct statfs {
uint32_t f_type;
uint32_t f_bsize;
uint32_t f_frsize;
uint32_t __pad;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_files;
uint64_t f_ffree;
uint64_t f_bavail;
__fsid_t f_fsid;
uint32_t f_namelen;
uint32_t f_flags;
uint32_t f_spare[5]; uint32_t f_spare[5];
}; };
*/
#endif /* _STATFS_PORTABLE_H_ */ #endif /* _STATFS_PORTABLE_H_ */