Merge ~canonical-kernel-team/+git/ltp:ag/fix-fs-fill into ~canonical-kernel-team/+git/ltp:sru

Proposed by Andrei Gherzan
Status: Merged
Approved by: Po-Hsu Lin
Approved revision: 5be52e828b502dcdae17434a07c920fb97e3b457
Merged at revision: 4c223555044366dac831c8859931727b4c1c38ee
Proposed branch: ~canonical-kernel-team/+git/ltp:ag/fix-fs-fill
Merge into: ~canonical-kernel-team/+git/ltp:sru
Diff against target: 26 lines (+6/-1)
1 file modified
testcases/kernel/fs/fs_fill/fs_fill.c (+6/-1)
Reviewer Review Type Date Requested Status
Po-Hsu Lin Approve
Thadeu Lima de Souza Cascardo (community) Approve
Review via email: mp+437364@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Thadeu Lima de Souza Cascardo (cascardo) :
review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Tested with K-5.19 on kopter-kernel.
+1

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied with "UBUNTU: SAUCE:" added to the title.

Revision history for this message
Andrei Gherzan (agherzan) wrote :

Thanks! I've tested this on a retrigger and it works as expected.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/testcases/kernel/fs/fs_fill/fs_fill.c b/testcases/kernel/fs/fs_fill/fs_fill.c
2index 66b3974..3bf7df5 100644
3--- a/testcases/kernel/fs/fs_fill/fs_fill.c
4+++ b/testcases/kernel/fs/fs_fill/fs_fill.c
5@@ -18,6 +18,7 @@
6 #include "tst_test.h"
7
8 #define MNTPOINT "mntpoint"
9+#define THREADS_SUBDIR "subdir"
10
11 static volatile int run;
12 static unsigned int nthreads;
13@@ -94,9 +95,13 @@ static void setup(void)
14 nthreads = tst_ncpus_conf() + 2;
15 workers = SAFE_MALLOC(sizeof(struct worker) * nthreads);
16
17+ // Avoid creating the thread directories in the root of the filesystem
18+ // to not hit the root entries limit on a FAT16 filesystem.
19+ SAFE_MKDIR(MNTPOINT "/" THREADS_SUBDIR, 0700);
20+
21 for (i = 0; i < nthreads; i++) {
22 snprintf(workers[i].dir, sizeof(workers[i].dir),
23- MNTPOINT "/thread%i", i + 1);
24+ MNTPOINT "/" THREADS_SUBDIR "/thread%i", i + 1);
25 SAFE_MKDIR(workers[i].dir, 0700);
26 }
27

Subscribers

People subscribed via source and target branches

to all changes: