-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #179109: coreutils: reintroduce patch disabling SEEK_HOLE
...into staging
- Loading branch information
Showing
2 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
diff --git a/src/copy.c b/src/copy.c | ||
index cb9018f93..2a4ccc061 100644 | ||
--- a/src/copy.c | ||
+++ b/src/copy.c | ||
@@ -502,7 +502,7 @@ write_zeros (int fd, off_t n_bytes) | ||
return true; | ||
} | ||
|
||
-#ifdef SEEK_HOLE | ||
+#if 0 | ||
/* Perform an efficient extent copy, if possible. This avoids | ||
the overhead of detecting holes in hole-introducing/preserving | ||
copy, and thus makes copying sparse files much more efficient. | ||
@@ -1095,7 +1095,7 @@ infer_scantype (int fd, struct stat const *sb, | ||
&& ST_NBLOCKS (*sb) < sb->st_size / ST_NBLOCKSIZE)) | ||
return PLAIN_SCANTYPE; | ||
|
||
-#ifdef SEEK_HOLE | ||
+#if 0 | ||
scan_inference->ext_start = lseek (fd, 0, SEEK_DATA); | ||
if (0 <= scan_inference->ext_start) | ||
return LSEEK_SCANTYPE; | ||
@@ -1377,7 +1377,7 @@ copy_reg (char const *src_name, char const *dst_name, | ||
off_t n_read; | ||
bool wrote_hole_at_eof = false; | ||
if (! ( | ||
-#ifdef SEEK_HOLE | ||
+#if 0 | ||
scantype == LSEEK_SCANTYPE | ||
? lseek_copy (source_desc, dest_desc, buf, buf_size, hole_size, | ||
scan_inference.ext_start, src_open_sb.st_size, | ||
diff --git a/tests/seek-data-capable b/tests/seek-data-capable | ||
index cc6372214..6e7a9ec1e 100644 | ||
--- a/tests/seek-data-capable | ||
+++ b/tests/seek-data-capable | ||
@@ -1,5 +1,7 @@ | ||
import sys, os, errno, platform | ||
|
||
+sys.exit(1) | ||
+ | ||
# Pass an _empty_ file | ||
if len(sys.argv) != 2: | ||
sys.exit(1) |