replace genext2fs with populate-extfs.sh

The max length of debugfs argument is 256 which is too short, the arguments are two paths, the PATH_MAX is 4096 according to /usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux systems), that's also what the ss library uses.

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
 .../e2fsprogs-1.42.8/debugfs-too-short.patch       |   41 ++++++++++++++++++++
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
 2 files changed, 42 insertions(+)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-too-short.patch new file +41 -0

new file mode 100644
index 0000000..607305b
@@ -0,0 +1,41 @@
+debugfs.c: the max length of debugfs argument is too short
+
+The max length of debugfs argument is 256 which is too short, the
+arguments are two paths, the PATH_MAX is 4096 according to
+/usr/include/linux/limits.h, so use BUFSIZ (which is 8192 on Linux
+systems), that's also what the ss library uses.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -37,6 +37,10 @@ extern char *optarg;
+ #include "../version.h"
+ #include "jfs_user.h"
+ 
++#ifndef BUFSIZ
++#define BUFSIZ 8192
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -2311,7 +2315,7 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
+ static int source_file(const char *cmd_file, int ss_idx)
+ {
+ 	FILE		*f;
+-	char		buf[256];
++	char		buf[BUFSIZ];
+ 	char		*cp;
+ 	int		exit_status = 0;
+ 	int		retval;
+-- 
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index d231268..f97de7f 100644
@@ -3,6 +3,7 @@ require e2fsprogs.inc
 
 SRC_URI += "file://acinclude.m4 \
             file://remove.ldconfig.call.patch \
+            file://debugfs-too-short.patch \
 "
 
 SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto"

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
 .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch     |  147 ++++++++++++++++++++
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
 2 files changed, 148 insertions(+)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +59 -0

new file mode 100644
index 0000000..c87bcbf
@@ -0,0 +1,147 @@
+debugfs.c: do sparse copy when src is a sparse file
+
+Let debugfs do sparse copy when src is a sparse file, just like
+"cp --sparse=auto"
+
+* For the:
+  #define IO_BUFSIZE 64*1024
+  this is a suggested value from gnu coreutils:
+  http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD
+
+* Use malloc() to allocate memory for the buffer since put 64K (or
+  more) on the stack seems not a good idea.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 57 insertions(+), 4 deletions(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -41,6 +41,16 @@ extern char *optarg;
+ #define BUFSIZ 8192
+ #endif
+ 
++/* 64KiB is the minimium blksize to best minimize system call overhead. */
++#ifndef IO_BUFSIZE
++#define IO_BUFSIZE 64*1024
++#endif
++
++/* Block size for `st_blocks' */
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[])
+ }
+ 
+ #ifndef READ_ONLY
+-static errcode_t copy_file(int fd, ext2_ino_t newfile)
++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes)
+ {
+ 	ext2_file_t	e2_file;
+ 	errcode_t	retval;
+ 	int		got;
+ 	unsigned int	written;
+-	char		buf[8192];
++	char		*buf;
+ 	char		*ptr;
++	char		*zero_buf;
++	int		cmp;
+ 
+ 	retval = ext2fs_file_open(current_fs, newfile,

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +78 -0

++	retval = ext2fs_get_memzero(bufsize, &zero_buf);
++	if (retval) {
++		com_err("copy_file", retval, "can't allocate buffer\n");
++		return retval;
++	}
++
+ 	while (1) {
+-		got = read(fd, buf, sizeof(buf));
++		got = read(fd, buf, bufsize);
+ 		if (got == 0)
+ 			break;
+ 		if (got < 0) {
+@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+ 			goto fail;
+ 		}
+ 		ptr = buf;
++
++		/* Sparse copy */
++		if (make_holes) {
++			/* Check whether all is zero */
++			cmp = memcmp(ptr, zero_buf, got);
++			if (cmp == 0) {
++				 /* The whole block is zero, make a hole */
++				retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL);
++				if (retval)
++					goto fail;
++				got = 0;
++			}
++		}
++
++		/* Normal copy */
+ 		while (got > 0) {
+ 			retval = ext2fs_file_write(e2_file, ptr,
+ 						   got, &written);
+@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+ 			ptr += written;
+ 		}
+ 	}
++	free(buf);
++	ext2fs_free_mem(&zero_buf);
+ 	retval = ext2fs_file_close(e2_file);
+ 	return retval;
+ 
+ fail:
++	free(buf);
++	ext2fs_free_mem(&zero_buf);
+ 	(void) ext2fs_file_close(e2_file);
+ 	return retval;
+ }
+@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[])
+ 	ext2_ino_t	newfile;
+ 	errcode_t	retval;
+ 	struct ext2_inode inode;
++	int		bufsize = IO_BUFSIZE;
++	int		make_holes = 0;
+ 
+ 	if (common_args_process(argc, argv, 3, 3, "write",
+ 				"<native file> <new file>", CHECK_FS_RW))
+@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[])
+ 		return;
+ 	}
+ 	if (LINUX_S_ISREG(inode.i_mode)) {
+-		retval = copy_file(fd, newfile);
++		if (statbuf.st_blocks < statbuf.st_size / S_BLKSIZE) {
++			make_holes = 1;
++			/*
++			 * Use I/O blocksize as buffer size when
++			 * copying sparse files.
++			 */
++			bufsize = statbuf.st_blksize;
++		}
++		retval = copy_file(fd, newfile, bufsize, make_holes);
+ 		if (retval)
+ 			com_err("copy_file", retval, 0);
+ 	}
+-- 
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index f97de7f..5d65bbc 100644
@@ -4,6 +4,7 @@ require e2fsprogs.inc
 SRC_URI += "file://acinclude.m4 \
             file://remove.ldconfig.call.patch \
             file://debugfs-too-short.patch \
+            file://debugfs-sparse-copy.patch \
 "
 
 SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

Quoted 7 lines · Robert Yang

Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto"

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Minor whitespace nit below, but will likely be caught by upstream.

--
Darren

Quoted 73 lines

Signed-off-by Robert Yang <[email protected]>

---
  .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch     |  147 ++++++++++++++++++++
  .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
  2 files changed, 148 insertions(+)

create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +59 -0

new file mode 100644
index 0000000..c87bcbf
@@ -0,0 +1,147 @@
+debugfs.c: do sparse copy when src is a sparse file
+
+Let debugfs do sparse copy when src is a sparse file, just like
+"cp --sparse=auto"
+
+* For the:
+  #define IO_BUFSIZE 64*1024
+  this is a suggested value from gnu coreutils:
+  http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD
+
+* Use malloc() to allocate memory for the buffer since put 64K (or
+  more) on the stack seems not a good idea.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 57 insertions(+), 4 deletions(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -41,6 +41,16 @@ extern char *optarg;
+ #define BUFSIZ 8192
+ #endif
+
++/* 64KiB is the minimium blksize to best minimize system call overhead. */
++#ifndef IO_BUFSIZE
++#define IO_BUFSIZE 64*1024
++#endif
++
++/* Block size for `st_blocks' */
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[])
+ }
+
+ #ifndef READ_ONLY
+-static errcode_t copy_file(int fd, ext2_ino_t newfile)
++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes)
+ {
+ 	ext2_file_t	e2_file;
+ 	errcode_t	retval;
+ 	int		got;
+ 	unsigned int	written;
+-	char		buf[8192];
++	char		*buf;
+ 	char		*ptr;
++	char		*zero_buf;
++	int		cmp;
+
+ 	retval = ext2fs_file_open(current_fs, newfile,

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch line 69

Quoted 10 lines

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +10 -0

+ 				  EXT2_FILE_WRITE, &e2_file);
+ 	if (retval)
+ 		return retval;
+
++	if (!(buf = (char *) malloc(bufsize))){
++		com_err("copy_file", errno, "can't allocate buffer\n");
++		return;
++	}
++
++        /* This is used for checking whether the whole block is zero */

Whitespace/indentation error ^

Quoted 90 lines

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +78 -0

++	retval = ext2fs_get_memzero(bufsize, &zero_buf);
++	if (retval) {
++		com_err("copy_file", retval, "can't allocate buffer\n");
++		return retval;
++	}
++
+ 	while (1) {
+-		got = read(fd, buf, sizeof(buf));
++		got = read(fd, buf, bufsize);
+ 		if (got == 0)
+ 			break;
+ 		if (got < 0) {
+@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+ 			goto fail;
+ 		}
+ 		ptr = buf;
++
++		/* Sparse copy */
++		if (make_holes) {
++			/* Check whether all is zero */
++			cmp = memcmp(ptr, zero_buf, got);
++			if (cmp == 0) {
++				 /* The whole block is zero, make a hole */
++				retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL);
++				if (retval)
++					goto fail;
++				got = 0;
++			}
++		}
++
++		/* Normal copy */
+ 		while (got > 0) {
+ 			retval = ext2fs_file_write(e2_file, ptr,
+ 						   got, &written);
+@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+ 			ptr += written;
+ 		}
+ 	}
++	free(buf);
++	ext2fs_free_mem(&zero_buf);
+ 	retval = ext2fs_file_close(e2_file);
+ 	return retval;
+
+ fail:
++	free(buf);
++	ext2fs_free_mem(&zero_buf);
+ 	(void) ext2fs_file_close(e2_file);
+ 	return retval;
+ }
+@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[])
+ 	ext2_ino_t	newfile;
+ 	errcode_t	retval;
+ 	struct ext2_inode inode;
++	int		bufsize = IO_BUFSIZE;
++	int		make_holes = 0;
+
+ 	if (common_args_process(argc, argv, 3, 3, "write",
+ 				"<native file> <new file>", CHECK_FS_RW))
+@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[])
+ 		return;
+ 	}
+ 	if (LINUX_S_ISREG(inode.i_mode)) {
+-		retval = copy_file(fd, newfile);
++		if (statbuf.st_blocks < statbuf.st_size / S_BLKSIZE) {
++			make_holes = 1;
++			/*
++			 * Use I/O blocksize as buffer size when
++			 * copying sparse files.
++			 */
++			bufsize = statbuf.st_blksize;
++		}
++		retval = copy_file(fd, newfile, bufsize, make_holes);
+ 		if (retval)
+ 			com_err("copy_file", retval, 0);
+ 	}
+--
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index f97de7f..5d65bbc 100644
@@ -4,6 +4,7 @@ require e2fsprogs.inc
  SRC_URI += "file://acinclude.m4 \
              file://remove.ldconfig.call.patch \
              file://debugfs-too-short.patch \
+            file://debugfs-sparse-copy.patch \
  "
 
  SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto"

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
  .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch     |  147 ++++++++++++++++++++
  .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
  2 files changed, 148 insertions(+)

create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +62 -0

new file mode 100644
index 0000000..c87bcbf
@@ -0,0 +1,147 @@
+debugfs.c: do sparse copy when src is a sparse file
+
+Let debugfs do sparse copy when src is a sparse file, just like
+"cp --sparse=auto"
+
+* For the:
+  #define IO_BUFSIZE 64*1024
+  this is a suggested value from gnu coreutils:
+  http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD
+
+* Use malloc() to allocate memory for the buffer since put 64K (or
+  more) on the stack seems not a good idea.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 57 insertions(+), 4 deletions(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -41,6 +41,16 @@ extern char *optarg;
+ #define BUFSIZ 8192
+ #endif
+
++/* 64KiB is the minimium blksize to best minimize system call overhead. */
++#ifndef IO_BUFSIZE
++#define IO_BUFSIZE 64*1024
++#endif
++
++/* Block size for `st_blocks' */
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[])
+ }
+
+ #ifndef READ_ONLY
+-static errcode_t copy_file(int fd, ext2_ino_t newfile)
++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes)
+ {
+ 	ext2_file_t	e2_file;
+ 	errcode_t	retval;
+ 	int		got;
+ 	unsigned int	written;
+-	char		buf[8192];
++	char		*buf;
+ 	char		*ptr;
++	char		*zero_buf;
++	int		cmp;
+
+ 	retval = ext2fs_file_open(current_fs, newfile,
+ 				  EXT2_FILE_WRITE, &e2_file);
+ 	if (retval)
+ 		return retval;

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +75 -0

++		return retval;
++	}
++
+ 	while (1) {
+-		got = read(fd, buf, sizeof(buf));
++		got = read(fd, buf, bufsize);
+ 		if (got == 0)
+ 			break;
+ 		if (got < 0) {
+@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+ 			goto fail;
+ 		}
+ 		ptr = buf;
++
++		/* Sparse copy */
++		if (make_holes) {
++			/* Check whether all is zero */
++			cmp = memcmp(ptr, zero_buf, got);
++			if (cmp == 0) {
++				 /* The whole block is zero, make a hole */
++				retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL);
++				if (retval)
++					goto fail;
++				got = 0;
++			}
++		}
++
++		/* Normal copy */
+ 		while (got > 0) {
+ 			retval = ext2fs_file_write(e2_file, ptr,
+ 						   got, &written);
+@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+ 			ptr += written;
+ 		}
+ 	}
++	free(buf);
++	ext2fs_free_mem(&zero_buf);
+ 	retval = ext2fs_file_close(e2_file);
+ 	return retval;
+
+ fail:
++	free(buf);
++	ext2fs_free_mem(&zero_buf);
+ 	(void) ext2fs_file_close(e2_file);
+ 	return retval;
+ }
+@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[])
+ 	ext2_ino_t	newfile;
+ 	errcode_t	retval;
+ 	struct ext2_inode inode;
++	int		bufsize = IO_BUFSIZE;
++	int		make_holes = 0;
+
+ 	if (common_args_process(argc, argv, 3, 3, "write",
+ 				"<native file> <new file>", CHECK_FS_RW))
+@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[])
+ 		return;
+ 	}
+ 	if (LINUX_S_ISREG(inode.i_mode)) {
+-		retval = copy_file(fd, newfile);
++		if (statbuf.st_blocks < statbuf.st_size / S_BLKSIZE) {
++			make_holes = 1;
++			/*
++			 * Use I/O blocksize as buffer size when
++			 * copying sparse files.
++			 */
++			bufsize = statbuf.st_blksize;
++		}
++		retval = copy_file(fd, newfile, bufsize, make_holes);
+ 		if (retval)
+ 			com_err("copy_file", retval, 0);
+ 	}
+--
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index f97de7f..5d65bbc 100644
@@ -4,6 +4,7 @@ require e2fsprogs.inc
  SRC_URI += "file://acinclude.m4 \
              file://remove.ldconfig.call.patch \
              file://debugfs-too-short.patch \
+            file://debugfs-sparse-copy.patch \
  "
 
  SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

Quoted 93 lines · Robert Yang

Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto"

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
  .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch     |  147 ++++++++++++++++++++
  .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
  2 files changed, 148 insertions(+)

create mode 100644
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644
index 0000000..c87bcbf

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +9 -0

@@ -0,0 +1,147 @@
+debugfs.c: do sparse copy when src is a sparse file
+
+Let debugfs do sparse copy when src is a sparse file, just like
+"cp --sparse=auto"
+
+* For the:
+  #define IO_BUFSIZE 64*1024
+  this is a suggested value from gnu coreutils:
+

http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +38 -0

+
+* Use malloc() to allocate memory for the buffer since put 64K (or
+  more) on the stack seems not a good idea.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 57 insertions(+), 4 deletions(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -41,6 +41,16 @@ extern char *optarg;
+ #define BUFSIZ 8192
+ #endif
+
++/* 64KiB is the minimium blksize to best minimize system call overhead. */
++#ifndef IO_BUFSIZE
++#define IO_BUFSIZE 64*1024
++#endif
++
++/* Block size for `st_blocks' */
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[])
+ }
+
+ #ifndef READ_ONLY
+-static errcode_t copy_file(int fd, ext2_ino_t newfile)
++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int

make_holes)
+ {

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +18 -0

+     ext2_file_t    e2_file;
+     errcode_t    retval;
+     int        got;
+     unsigned int    written;
+-    char        buf[8192];
++    char        *buf;
+     char        *ptr;
++    char        *zero_buf;
++    int        cmp;
+
+     retval = ext2fs_file_open(current_fs, newfile,
+                   EXT2_FILE_WRITE, &e2_file);
+     if (retval)
+         return retval;
+
++    if (!(buf = (char *) malloc(bufsize))){
++        com_err("copy_file", errno, "can't allocate buffer\n");
++        return;

Quoted 6 lines

++ }
++
++ /* This is used for checking whether the whole block is zero */
++ retval = ext2fs_get_memzero(bufsize, &zero_buf);
++ if (retval) {
++ com_err("copy_file", retval, "can't allocate buffer\n");

should free(buf), or memory leak.

-Roy

Quoted 89 lines

++ return retval;
++ }
++

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +72 -0

+     while (1) {
+-        got = read(fd, buf, sizeof(buf));
++        got = read(fd, buf, bufsize);
+         if (got == 0)
+             break;
+         if (got < 0) {
+@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+             goto fail;
+         }
+         ptr = buf;
++
++        /* Sparse copy */
++        if (make_holes) {
++            /* Check whether all is zero */
++            cmp = memcmp(ptr, zero_buf, got);
++            if (cmp == 0) {
++                 /* The whole block is zero, make a hole */
++                retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL);
++                if (retval)
++                    goto fail;
++                got = 0;
++            }
++        }
++
++        /* Normal copy */
+         while (got > 0) {
+             retval = ext2fs_file_write(e2_file, ptr,
+                            got, &written);
+@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+             ptr += written;
+         }
+     }
++    free(buf);
++    ext2fs_free_mem(&zero_buf);
+     retval = ext2fs_file_close(e2_file);
+     return retval;
+
+ fail:
++    free(buf);
++    ext2fs_free_mem(&zero_buf);
+     (void) ext2fs_file_close(e2_file);
+     return retval;
+ }
+@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[])
+     ext2_ino_t    newfile;
+     errcode_t    retval;
+     struct ext2_inode inode;
++    int        bufsize = IO_BUFSIZE;
++    int        make_holes = 0;
+
+     if (common_args_process(argc, argv, 3, 3, "write",
+                 "<native file> <new file>", CHECK_FS_RW))
+@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[])
+         return;
+     }
+     if (LINUX_S_ISREG(inode.i_mode)) {
+-        retval = copy_file(fd, newfile);
++        if (statbuf.st_blocks < statbuf.st_size / S_BLKSIZE) {
++            make_holes = 1;
++            /*
++             * Use I/O blocksize as buffer size when
++             * copying sparse files.
++             */
++            bufsize = statbuf.st_blksize;
++        }
++        retval = copy_file(fd, newfile, bufsize, make_holes);
+         if (retval)
+             com_err("copy_file", retval, 0);
+     }
+--
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index f97de7f..5d65bbc 100644
@@ -4,6 +4,7 @@ require e2fsprogs.inc
  SRC_URI += "file://acinclude.m4 \
              file://remove.ldconfig.call.patch \
              file://debugfs-too-short.patch \
+            file://debugfs-sparse-copy.patch \
  "
 
  SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

Quoted 96 lines · Rongqing Li

Quoted 93 lines · Robert Yang

Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto"

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
  .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch     |  147 ++++++++++++++++++++
  .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
  2 files changed, 148 insertions(+)

create mode 100644
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644
index 0000000..c87bcbf

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +9 -0

@@ -0,0 +1,147 @@
+debugfs.c: do sparse copy when src is a sparse file
+
+Let debugfs do sparse copy when src is a sparse file, just like
+"cp --sparse=auto"
+
+* For the:
+  #define IO_BUFSIZE 64*1024
+  this is a suggested value from gnu coreutils:
+

http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +38 -0

+
+* Use malloc() to allocate memory for the buffer since put 64K (or
+  more) on the stack seems not a good idea.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 57 insertions(+), 4 deletions(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -41,6 +41,16 @@ extern char *optarg;
+ #define BUFSIZ 8192
+ #endif
+
++/* 64KiB is the minimium blksize to best minimize system call overhead. */
++#ifndef IO_BUFSIZE
++#define IO_BUFSIZE 64*1024
++#endif
++
++/* Block size for `st_blocks' */
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[])
+ }
+
+ #ifndef READ_ONLY
+-static errcode_t copy_file(int fd, ext2_ino_t newfile)
++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int

make_holes)
+ {

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +18 -0

+     ext2_file_t    e2_file;
+     errcode_t    retval;
+     int        got;
+     unsigned int    written;
+-    char        buf[8192];
++    char        *buf;
+     char        *ptr;
++    char        *zero_buf;
++    int        cmp;
+
+     retval = ext2fs_file_open(current_fs, newfile,
+                   EXT2_FILE_WRITE, &e2_file);
+     if (retval)
+         return retval;
+
++    if (!(buf = (char *) malloc(bufsize))){
++        com_err("copy_file", errno, "can't allocate buffer\n");
++        return;

Quoted 9 lines

Quoted 6 lines

++ }
++
++ /* This is used for checking whether the whole block is zero */
++ retval = ext2fs_get_memzero(bufsize, &zero_buf);
++ if (retval) {
++ com_err("copy_file", retval, "can't allocate buffer\n");

should free(buf), or memory leak.

Add a free(buf) and updated the PR:

git://git.pokylinux.org/poky-contrib robert/extX

// Robert

Quoted 92 lines

-Roy

Quoted 89 lines

++ return retval;
++ }
++

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +72 -0

+     while (1) {
+-        got = read(fd, buf, sizeof(buf));
++        got = read(fd, buf, bufsize);
+         if (got == 0)
+             break;
+         if (got < 0) {
+@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+             goto fail;
+         }
+         ptr = buf;
++
++        /* Sparse copy */
++        if (make_holes) {
++            /* Check whether all is zero */
++            cmp = memcmp(ptr, zero_buf, got);
++            if (cmp == 0) {
++                 /* The whole block is zero, make a hole */
++                retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL);
++                if (retval)
++                    goto fail;
++                got = 0;
++            }
++        }
++
++        /* Normal copy */
+         while (got > 0) {
+             retval = ext2fs_file_write(e2_file, ptr,
+                            got, &written);
+@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+             ptr += written;
+         }
+     }
++    free(buf);
++    ext2fs_free_mem(&zero_buf);
+     retval = ext2fs_file_close(e2_file);
+     return retval;
+
+ fail:
++    free(buf);
++    ext2fs_free_mem(&zero_buf);
+     (void) ext2fs_file_close(e2_file);
+     return retval;
+ }
+@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[])
+     ext2_ino_t    newfile;
+     errcode_t    retval;
+     struct ext2_inode inode;
++    int        bufsize = IO_BUFSIZE;
++    int        make_holes = 0;
+
+     if (common_args_process(argc, argv, 3, 3, "write",
+                 "<native file> <new file>", CHECK_FS_RW))
+@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[])
+         return;
+     }
+     if (LINUX_S_ISREG(inode.i_mode)) {
+-        retval = copy_file(fd, newfile);
++        if (statbuf.st_blocks < statbuf.st_size / S_BLKSIZE) {
++            make_holes = 1;
++            /*
++             * Use I/O blocksize as buffer size when
++             * copying sparse files.
++             */
++            bufsize = statbuf.st_blksize;
++        }
++        retval = copy_file(fd, newfile, bufsize, make_holes);
+         if (retval)
+             com_err("copy_file", retval, 0);
+     }
+--
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index f97de7f..5d65bbc 100644
@@ -4,6 +4,7 @@ require e2fsprogs.inc
  SRC_URI += "file://acinclude.m4 \
              file://remove.ldconfig.call.patch \
              file://debugfs-too-short.patch \
+            file://debugfs-sparse-copy.patch \
  "
 
  SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

Quoted 108 lines · Robert Yang

Quoted 96 lines · Rongqing Li

Quoted 93 lines · Robert Yang

Let debugfs do sparse copy when src is a sparse file, just like "cp --sparse=auto"

This patch has been reviewed by the linux-ext4 mailing list, but isn't merged atm.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
   .../e2fsprogs-1.42.8/debugfs-sparse-copy.patch     |  147 ++++++++++++++++++++
   .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
   2 files changed, 148 insertions(+)

create mode 100644
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file mode 100644
index 0000000..c87bcbf

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +9 -0

@@ -0,0 +1,147 @@
+debugfs.c: do sparse copy when src is a sparse file
+
+Let debugfs do sparse copy when src is a sparse file, just like
+"cp --sparse=auto"
+
+* For the:
+  #define IO_BUFSIZE 64*1024
+  this is a suggested value from gnu coreutils:
+

http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/ioblksize.h;h=1ae93255e7d0ccf0855208c7ae5888209997bf16;hb=HEAD

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +38 -0

+
+* Use malloc() to allocate memory for the buffer since put 64K (or
+  more) on the stack seems not a good idea.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <[email protected]>
+Acked-by: Darren Hart <[email protected]>
+---
+ debugfs/debugfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 57 insertions(+), 4 deletions(-)
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -41,6 +41,16 @@ extern char *optarg;
+ #define BUFSIZ 8192
+ #endif
+
++/* 64KiB is the minimium blksize to best minimize system call overhead. */
++#ifndef IO_BUFSIZE
++#define IO_BUFSIZE 64*1024
++#endif
++
++/* Block size for `st_blocks' */
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ ss_request_table *extra_cmds;
+ const char *debug_prog_name;
+ int sci_idx;
+@@ -1575,22 +1585,36 @@ void do_find_free_inode(int argc, char *argv[])
+ }
+
+ #ifndef READ_ONLY
+-static errcode_t copy_file(int fd, ext2_ino_t newfile)
++static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int

make_holes)
+ {

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +18 -0

+     ext2_file_t    e2_file;
+     errcode_t    retval;
+     int        got;
+     unsigned int    written;
+-    char        buf[8192];
++    char        *buf;
+     char        *ptr;
++    char        *zero_buf;
++    int        cmp;
+
+     retval = ext2fs_file_open(current_fs, newfile,
+                   EXT2_FILE_WRITE, &e2_file);
+     if (retval)
+         return retval;
+
++    if (!(buf = (char *) malloc(bufsize))){
++        com_err("copy_file", errno, "can't allocate buffer\n");
++        return;

Quoted 9 lines

Quoted 6 lines

++ }
++
++ /* This is used for checking whether the whole block is zero */
++ retval = ext2fs_get_memzero(bufsize, &zero_buf);
++ if (retval) {
++ com_err("copy_file", retval, "can't allocate buffer\n");

should free(buf), or memory leak.

Quoted 3 lines

Add a free(buf) and updated the PR:

git://git.pokylinux.org/poky-contrib robert/extX

Nice catch Rongqing, thank you.

Acked-by Darren Hart <[email protected]>

Robert, please resubmit a new version to the ext list with the memory leak and whitespace fixes. It's a good way to the attention back on the series.

--
Darren

Quoted 95 lines

// Robert

Quoted 92 lines

-Roy

Quoted 89 lines

++ return retval;
++ }
++

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/debugfs-sparse-copy.patch new file +72 -0

+     while (1) {
+-        got = read(fd, buf, sizeof(buf));
++        got = read(fd, buf, bufsize);
+         if (got == 0)
+             break;
+         if (got < 0) {
+@@ -1598,6 +1622,21 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+             goto fail;
+         }
+         ptr = buf;
++
++        /* Sparse copy */
++        if (make_holes) {
++            /* Check whether all is zero */
++            cmp = memcmp(ptr, zero_buf, got);
++            if (cmp == 0) {
++                 /* The whole block is zero, make a hole */
++                retval = ext2fs_file_lseek(e2_file, got, EXT2_SEEK_CUR, NULL);
++                if (retval)
++                    goto fail;
++                got = 0;
++            }
++        }
++
++        /* Normal copy */
+         while (got > 0) {
+             retval = ext2fs_file_write(e2_file, ptr,
+                            got, &written);
+@@ -1608,10 +1647,14 @@ static errcode_t copy_file(int fd, ext2_ino_t newfile)
+             ptr += written;
+         }
+     }
++    free(buf);
++    ext2fs_free_mem(&zero_buf);
+     retval = ext2fs_file_close(e2_file);
+     return retval;
+
+ fail:
++    free(buf);
++    ext2fs_free_mem(&zero_buf);
+     (void) ext2fs_file_close(e2_file);
+     return retval;
+ }
+@@ -1624,6 +1667,8 @@ void do_write(int argc, char *argv[])
+     ext2_ino_t    newfile;
+     errcode_t    retval;
+     struct ext2_inode inode;
++    int        bufsize = IO_BUFSIZE;
++    int        make_holes = 0;
+
+     if (common_args_process(argc, argv, 3, 3, "write",
+                 "<native file> <new file>", CHECK_FS_RW))
+@@ -1699,7 +1744,15 @@ void do_write(int argc, char *argv[])
+         return;
+     }
+     if (LINUX_S_ISREG(inode.i_mode)) {
+-        retval = copy_file(fd, newfile);
++        if (statbuf.st_blocks < statbuf.st_size / S_BLKSIZE) {
++            make_holes = 1;
++            /*
++             * Use I/O blocksize as buffer size when
++             * copying sparse files.
++             */
++            bufsize = statbuf.st_blksize;
++        }
++        retval = copy_file(fd, newfile, bufsize, make_holes);
+         if (retval)
+             com_err("copy_file", retval, 0);
+     }
+--
+1.8.1.2
+

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb +1 -0

index f97de7f..5d65bbc 100644
@@ -4,6 +4,7 @@ require e2fsprogs.inc
   SRC_URI += "file://acinclude.m4 \
               file://remove.ldconfig.call.patch \
               file://debugfs-too-short.patch \
+            file://debugfs-sparse-copy.patch \
   "
 
   SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"

We only read the cache when:

bufsize == sizeof(struct ext2_inode)

then we should only update the cache in the same condition, otherwise there would be errors, for example:

cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full()

Then update the cache:
cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full()

Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was cached by bufsize = 156), so there would be errors.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

+Upstream-Status: [Inappropriate]

Quoted 15 lines · Robert Yang

We only read the cache when:

bufsize == sizeof(struct ext2_inode)

then we should only update the cache in the same condition, otherwise there would be errors, for example:

cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full()

Then update the cache:
cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full()

Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was cached by bufsize = 156), so there would be errors.

Quoted 6 lines

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

+Upstream-Status: [Inappropriate]

Hrm... why is this one inappropriate?

Quoted 22 lines · Darren Hart

Quoted 19 lines · Robert Yang

We only read the cache when:

bufsize == sizeof(struct ext2_inode)

then we should only update the cache in the same condition, otherwise there would be errors, for example:

cache[0]: cached ino 14 when bufsize = 128 by ext2fs_write_inode_full() cache[1]: cached ino 14 when bufsize = 156 by ext2fs_read_inode_full()

Then update the cache:
cache[0]: cached ino 15 when bufsize = 156 by ext2fs_read_inode_full()

Then the ino 14 would hit the cache[1] when bufsize = 128 (but it was cached by bufsize = 156), so there would be errors.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

Quoted 4 lines

Quoted 1 line

+Upstream-Status: [Inappropriate]

Hrm... why is this one inappropriate?

Hi Darren, the upstream has changed the icache lot, so this patch is inappropriate for the upstream, we can drop this patch when we update the package, I had put this in the patch head.

do_write doesn't fully set up the first extent header on a new inode, so if we write a 0-length file, and don't write any data to the new file, we end up creating something that looks corrupt to kernelspace:

EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm
ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0)

Do something similar to ext4_ext_tree_init() here, and fill out the first extent header upon creation to avoid this.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
 .../e2fsprogs-1.42.8/debugfs-extent-header.patch   |   47 ++++++++++++++++++++
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    2 +

+Upstream-Status: Backport

Quoted 14 lines · Robert Yang

do_write doesn't fully set up the first extent header on a new inode, so if we write a 0-length file, and don't write any data to the new file, we end up creating something that looks corrupt to kernelspace:

EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm
ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0)

Do something similar to ext4_ext_tree_init() here, and fill out the first extent header upon creation to avoid this.

[YOCTO #3848]

Quoted 6 lines

Signed-off-by Robert Yang <[email protected]>

---
  .../e2fsprogs-1.42.8/debugfs-extent-header.patch   |   47 ++++++++++++++++++++
  .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    2 +

+Upstream-Status: Backport

Should we backport? Or should we just update the revision we use?

Quoted 20 lines · Darren Hart

Quoted 18 lines · Robert Yang

do_write doesn't fully set up the first extent header on a new inode, so if we write a 0-length file, and don't write any data to the new file, we end up creating something that looks corrupt to kernelspace:

EXT4-fs error (device loop0): ext4_ext_check_inode:464: inode #12: comm
ls: bad header/extent: invalid magic - magic 0, entries 0, max 0(0), depth 0(0)

Do something similar to ext4_ext_tree_init() here, and fill out the first extent header upon creation to avoid this.

[YOCTO #3848]

Signed-off-by Robert Yang <[email protected]>

---
  .../e2fsprogs-1.42.8/debugfs-extent-header.patch   |   47 ++++++++++++++++++++
  .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    2 +

Quoted 4 lines

Quoted 1 line

+Upstream-Status: Backport

Should we backport? Or should we just update the revision we use?

Yes, I think so, Ted said that he had merge this patch a few days ago, but I didn't see where is it, I pulled this patch from the linux ext mailing list.

This script is originally from Darren Hart, it will be used for creating the ext* filesystem from a given directory, which will replace the genext2fs in image_types.bbclass at the moment, we may use the mke2fs to replace this script again when it has the initial directory support.

Changes of the script:
* Rename it from mkdebugfs.sh to populate-extfs.sh
* Add a simple usage
* Add checking for the number of the parameters
* Add the "regular empty file" and "fifo" file type
* Set mode, uid and gid for the file
* Save the command lines to a file and batch run them
* Change the error message
* Improve the performance
* Add the support for hardlink

[YOCTO #3848]

Signed-off-by Darren Hart <[email protected]>

Signed-off-by Robert Yang <[email protected]>

Quoted 17 lines · Robert Yang

This script is originally from Darren Hart, it will be used for creating the ext* filesystem from a given directory, which will replace the genext2fs in image_types.bbclass at the moment, we may use the mke2fs to replace this script again when it has the initial directory support.

Changes of the script:
* Rename it from mkdebugfs.sh to populate-extfs.sh
* Add a simple usage
* Add checking for the number of the parameters
* Add the "regular empty file" and "fifo" file type
* Set mode, uid and gid for the file
* Save the command lines to a file and batch run them
* Change the error message
* Improve the performance
* Add the support for hardlink

[YOCTO #3848]

Quoted 2 lines

Signed-off-by Darren Hart <[email protected]>

Signed-off-by Robert Yang <[email protected]>

Ted has offered to add this to the contrib dir for the ext2 tools. This is fine to add to yocto, but we should contribute this back upstream as well.