apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: Move fallocate include into global.h

Browse Source 
Move the inclusion of falloc.h with all it's possible defines for the
fallocate mode into global.h header file so we do not have to include
and define it manually in every tool using fallocate.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Lukas Czerner
2014-03-13 15:19:52 +11:00
committed by Dave Chinner
parent 613cb3027c
commit 2dc43e03e6
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ltp/fsstress.c
+2 -9
View File
@@ -27,13 +27,6 @@
#ifdef HAVE_LINUX_FIEMAP_H
#include <linux/fiemap.h>
#endif
#ifdef FALLOCATE
#include <linux/falloc.h>
#ifndef FALLOC_FL_PUNCH_HOLE
/* Copy-paste from linux/falloc.h */
#define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
#endif
#endif
#ifndef HAVE_ATTR_LIST
#define attr_list(path, buf, size, flags, cursor) (errno = -ENOSYS, -1)
#endif
@@ -2093,7 +2086,7 @@ dwrite_f(int opno, long r)
void
fallocate_f(int opno, long r)
{
#ifdef FALLOCATE
#ifdef HAVE_LINUX_FALLOC_H
int e;
pathname_t f;
int fd;
@@ -2515,7 +2508,7 @@ mknod_f(int opno, long r)
void
punch_f(int opno, long r)
{
#ifdef FALLOCATE
#ifdef HAVE_LINUX_FALLOC_H
int e;
pathname_t f;
int fd;
ltp/fsx.c
+4 -7
View File
@@ -33,9 +33,6 @@
#ifdef AIO
#include <libaio.h>
#endif
#ifdef FALLOCATE
#include <linux/falloc.h>
#endif
#ifndef MAP_FILE
# define MAP_FILE 0
@@ -882,7 +879,7 @@ do_punch_hole(unsigned offset, unsigned length)
}
#endif
#ifdef FALLOCATE
#ifdef HAVE_LINUX_FALLOC_H
/* fallocate is basically a no-op unless extending, then a lot like a truncate */
void
do_preallocate(unsigned offset, unsigned length)
@@ -1139,7 +1136,7 @@ usage(void)
" -A: Use the AIO system calls\n"
#endif
" -D startingop: debug output starting at specified operation\n"
#ifdef FALLOCATE
#ifdef HAVE_LINUX_FALLOC_H
" -F: Do not use fallocate (preallocation) calls\n"
#endif
#ifdef FALLOC_FL_PUNCH_HOLE
@@ -1296,7 +1293,7 @@ int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset)
void
test_fallocate()
{
#ifdef FALLOCATE
#ifdef HAVE_LINUX_FALLOC_H
if (!lite && fallocate_calls) {
if (fallocate(fd, 0, 0, 1) && errno == EOPNOTSUPP) {
if(!quiet)
@@ -1306,7 +1303,7 @@ test_fallocate()
ftruncate(fd, 0);
}
}
#else /* ! FALLOCATE */
#else /* ! HAVE_LINUX_FALLOC_H */
fallocate_calls = 0;
#endif