Skip to contentSkip to conversation

tst_fill_fs: enhance the filesystem filling routine

PATCH New Li Wang 2 participants 2 messages Nov 26, 2019 – Jan 6, 2020 Library code

lore
Share & tools
lore

Li Wang

author
#0 lore raw

PATCH v3 1/1 tst_fill_fs: enhance the filesystem filling routine

Do more tries with size in half when write() getting ENOSPC, until the size is less than the filesystem block size. Though we can't really fill a filesystem full, this could make the routine more robust.

---

Notes:
v2 --> v3
* move the condition judgment into while loop
* reserve the print&return part in the loop

 lib/tst_fill_fs.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
lib/tst_fill_fs.c +10 -0
index 4003dce97..121dd2f20 100644
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/statvfs.h>
 
 #define TST_NO_DEFAULT_MAIN
 #include "tst_test.h"
@@ -19,6 +20,8 @@ void tst_fill_fs(const char *path, int verbose)
 	size_t len;
 	ssize_t ret;
 	int fd;
+	struct statvfs fi;
+	statvfs(path, &fi);
 
 	for (;;) {
 		len = random() % (1024 * 102400);
@@ -41,6 +44,13 @@ void tst_fill_fs(const char *path, int verbose)
 			ret = write(fd, buf, MIN(len, sizeof(buf)));
 
 			if (ret < 0) {
+				/* retry on ENOSPC to make sure filesystem is really full */
+				if (errno == ENOSPC && len >= fi.f_bsize/2) {
+					SAFE_FSYNC(fd);
+					len /= 2;
+					continue;
+				}
+
 				SAFE_CLOSE(fd);
 
 				if (errno != ENOSPC)
Signature · 1 line
2.20.1