tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch

   1 From 01551bdba16ab16512a01affe02ade32c41ede8a 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  misc/create_inode.c | 8 ++++----
  14  1 file changed, 4 insertions(+), 4 deletions(-)
  15
  16 --- a/misc/create_inode.c
  17 +++ b/misc/create_inode.c
  18 @@ -392,7 +392,7 @@ static ssize_t my_pread(int fd, void *bu
  19  }
  20  #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
  21
  22 -static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
  23 +static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file,
  24                                  off_t start, off_t end, char *buf,
  25                                  char *zerobuf)
  26  {
  27 @@ -466,7 +466,7 @@ static errcode_t try_lseek_copy(ext2_fil
  28
  29                 data_blk = data & ~(fs->blocksize - 1);
  30                 hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1);
  31 -               err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
  32 +               err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf,
  33                                       zerobuf);
  34                 if (err)
  35                         return err;
  36 @@ -516,7 +516,7 @@ static errcode_t try_fiemap_copy(ext2_fi
  37                 }
  38                 for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents;
  39                      i++, ext++) {
  40 -                       err = copy_file_range(fs, fd, e2_file, ext->fe_logical,
  41 +                       err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical,
  42                                               ext->fe_logical + ext->fe_length,
  43                                               buf, zerobuf);
  44                         if (err)
  45 @@ -569,7 +569,7 @@ static errcode_t copy_file(ext2_filsys f
  46                 goto out;
  47  #endif
  48
  49 -       err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
  50 +       err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
  51                               zerobuf);
  52  out:
  53         ext2fs_free_mem(&zerobuf);