diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-02-23 08:22:24 -0800 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2018-02-24 12:04:55 +0800 |
| commit | 5e6514523342b51c18b059b61b51c1f619754fd0 (patch) | |
| tree | 936d4d95366205aa4c5584c85a6071654df26cfc | |
| parent | 715eac1a9e665e9fe4910d19dbca172cb7f2d459 (diff) | |
| download | xfstests-5e6514523342b51c18b059b61b51c1f619754fd0.tar.gz | |
fsstress: avoid infinite loops in clonerange_f
Evidently ceph will report a 4M blocksize, which trips clonerange_f's
clumsy attempt to avoid reflinking an extent on top of itself. The
original code assumed that "pick a random destination up to 1MB past the
end of the file" would suffice, but that clearly won't with a 4M
blocksize. Instead, we'll change it to 1024*blksize.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Tested-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
| -rw-r--r-- | ltp/fsstress.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 935f5de2d4..e1070997f3 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -2222,6 +2222,7 @@ clonerange_f( off64_t lr; off64_t off1; off64_t off2; + off64_t max_off2; size_t len; int v1; int v2; @@ -2305,9 +2306,10 @@ clonerange_f( * If srcfile == destfile, randomly generate destination ranges * until we find one that doesn't overlap the source range. */ + max_off2 = MIN(stat2.st_size + (1024ULL * stat2.st_blksize), MAXFSIZE); do { lr = ((int64_t)random() << 32) + random(); - off2 = (off64_t)(lr % MIN(stat2.st_size + (1024 * 1024), MAXFSIZE)); + off2 = (off64_t)(lr % max_off2); off2 %= maxfsize; off2 &= ~(stat2.st_blksize - 1); } while (stat1.st_ino == stat2.st_ino && llabs(off2 - off1) < len); |