fsstress: Add fallocate insert range operation

This commit adds insert operation support for fsstress, which is
meant to exercise fallocate FALLOC_FL_INSERT_RANGE support.

[dchinner: turn off this op for xfs/068, which expects an exact
outcome from the fsstress execution. ]

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Namjae Jeon
2015-02-25 15:34:48 +11:00
committed by Dave Chinner
parent 91843cb0c8
commit 6e5194daba
3 changed files with 22 additions and 3 deletions
+16 -3
View File
@@ -72,6 +72,7 @@ typedef enum {
OP_PUNCH,
OP_ZERO,
OP_COLLAPSE,
OP_INSERT,
OP_READ,
OP_READLINK,
OP_RENAME,
@@ -170,6 +171,7 @@ void mknod_f(int, long);
void punch_f(int, long);
void zero_f(int, long);
void collapse_f(int, long);
void insert_f(int, long);
void read_f(int, long);
void readlink_f(int, long);
void rename_f(int, long);
@@ -209,6 +211,7 @@ opdesc_t ops[] = {
{ OP_PUNCH, "punch", punch_f, 1, 1 },
{ OP_ZERO, "zero", zero_f, 1, 1 },
{ OP_COLLAPSE, "collapse", collapse_f, 1, 1 },
{ OP_INSERT, "insert", insert_f, 1, 1 },
{ OP_READ, "read", read_f, 1, 0 },
{ OP_READLINK, "readlink", readlink_f, 1, 0 },
{ OP_RENAME, "rename", rename_f, 2, 1 },
@@ -2176,6 +2179,7 @@ struct print_flags falloc_flags [] = {
{ FALLOC_FL_NO_HIDE_STALE, "NO_HIDE_STALE"},
{ FALLOC_FL_COLLAPSE_RANGE, "COLLAPSE_RANGE"},
{ FALLOC_FL_ZERO_RANGE, "ZERO_RANGE"},
{ FALLOC_FL_INSERT_RANGE, "INSERT_RANGE"},
{ -1, NULL}
};
@@ -2227,10 +2231,11 @@ do_fallocate(int opno, long r, int mode)
off %= maxfsize;
len = (off64_t)(random() % (1024 * 1024));
/*
* Collapse range requires off and len to be block aligned, make it
* more likely to be the case.
* Collapse/insert range requires off and len to be block aligned,
* make it more likely to be the case.
*/
if ((mode & FALLOC_FL_COLLAPSE_RANGE) && (opno % 2)) {
if ((mode & (FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_INSERT_RANGE)) &&
(opno % 2)) {
off = ((off + stb.st_blksize - 1) & ~(stb.st_blksize - 1));
len = ((len + stb.st_blksize - 1) & ~(stb.st_blksize - 1));
}
@@ -2655,6 +2660,14 @@ collapse_f(int opno, long r)
#endif
}
void
insert_f(int opno, long r)
{
#ifdef HAVE_LINUX_FALLOC_H
do_fallocate(opno, r, FALLOC_FL_INSERT_RANGE);
#endif
}
void
read_f(int opno, long r)
{
+4
View File
@@ -172,6 +172,10 @@
#define FALLOC_FL_ZERO_RANGE 0x10
#endif
#ifndef FALLOC_FL_INSERT_RANGE
#define FALLOC_FL_INSERT_RANGE 0x20
#endif
#endif /* HAVE_LINUX_FALLOC_H */
#endif /* GLOBAL_H */
+2
View File
@@ -43,6 +43,8 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
_supported_fs xfs
_supported_os Linux
# need to ensure new fsstress operations don't perturb expected output
FSSTRESS_AVOID="-f insert=0 $FSSTRESS_AVOID"
_create_dumpdir_stress_num 4096
_do_dump_restore