diff options
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-rename-copy_file_range-to-copy_file_chunk.patch | 62 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb | 1 |
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-rename-copy_file_range-to-copy_file_chunk.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-rename-copy_file_range-to-copy_file_chunk.patch new file mode 100644 index 0000000000..308fe0e292 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-rename-copy_file_range-to-copy_file_chunk.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 647353f7c3fd29e1ffd468d7ff56d9643047ab35 Mon Sep 17 00:00:00 2001 | ||
2 | From: Palmer Dabbelt <palmer@dabbelt.com> | ||
3 | Date: Fri, 29 Dec 2017 10:19:51 -0800 | ||
4 | Subject: [PATCH] misc: rename copy_file_range to copy_file_chunk | ||
5 | |||
6 | As of 2.27, glibc will have a copy_file_range library call to wrap the | ||
7 | new copy_file_range system call. This conflicts with the function in | ||
8 | misc/create_inode.c, which this patch renames _copy_file_range. | ||
9 | |||
10 | Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com> | ||
11 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | |||
15 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
16 | --- | ||
17 | misc/create_inode.c | 8 ++++---- | ||
18 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/misc/create_inode.c b/misc/create_inode.c | ||
21 | index 8ce3fafa..cd89146f 100644 | ||
22 | --- a/misc/create_inode.c | ||
23 | +++ b/misc/create_inode.c | ||
24 | @@ -396,7 +396,7 @@ static ssize_t my_pread(int fd, void *buf, size_t count, off_t offset) | ||
25 | } | ||
26 | #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */ | ||
27 | |||
28 | -static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, | ||
29 | +static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, | ||
30 | off_t start, off_t end, char *buf, | ||
31 | char *zerobuf) | ||
32 | { | ||
33 | @@ -470,7 +470,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, | ||
34 | |||
35 | data_blk = data & ~(fs->blocksize - 1); | ||
36 | hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); | ||
37 | - err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, | ||
38 | + err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, | ||
39 | zerobuf); | ||
40 | if (err) | ||
41 | return err; | ||
42 | @@ -521,7 +521,7 @@ static errcode_t try_fiemap_copy(ext2_filsys fs, int fd, ext2_file_t e2_file, | ||
43 | goto out; | ||
44 | for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents; | ||
45 | i++, ext++) { | ||
46 | - err = copy_file_range(fs, fd, e2_file, ext->fe_logical, | ||
47 | + err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical, | ||
48 | ext->fe_logical + ext->fe_length, | ||
49 | buf, zerobuf); | ||
50 | if (err) | ||
51 | @@ -574,7 +574,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf, | ||
52 | goto out; | ||
53 | #endif | ||
54 | |||
55 | - err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, | ||
56 | + err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf, | ||
57 | zerobuf); | ||
58 | out: | ||
59 | ext2fs_free_mem(&zerobuf); | ||
60 | -- | ||
61 | 2.16.2 | ||
62 | |||
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb index 00093cc20c..f1d7c08209 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb | |||
@@ -10,6 +10,7 @@ SRC_URI += "file://acinclude.m4 \ | |||
10 | file://mkdir_p.patch \ | 10 | file://mkdir_p.patch \ |
11 | file://reproducible-doc.patch \ | 11 | file://reproducible-doc.patch \ |
12 | file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ | 12 | file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ |
13 | file://0001-misc-rename-copy_file_range-to-copy_file_chunk.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" | 16 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" |