summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-08-22 17:16:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 07:50:00 +0100
commit4253bded02b77c50554a25f11a427e3bb351f081 (patch)
tree5ae67a5ca00582457769a814fd89e24b7d0ba5a6 /meta/recipes-devtools
parenta24081dd28bdb5676cfb3505b7f042fba38c74f9 (diff)
downloadpoky-4253bded02b77c50554a25f11a427e3bb351f081.tar.gz
mtools: fix race issue while mtools invoked frequently
While invoking mtools frequently, the unblocking request caused race issue. Here is an example of syslinux [snip] dd if=/dev/zero of=floppy.img bs=1024 count=144 losetup /dev/loop1 floppy.img mkdosfs /dev/loop1 syslinux -i /dev/loop1 |plain floppy: device "/proc/6351/fd/3" busy (Resource temporarily unavailable): |Cannot initialize 'S:' |Bad target s:/ldlinux.sys [snip] The idea is from: https://bugzilla.redhat.com/show_bug.cgi?id=1235016 https://groups.google.com/a/chromium.org/forum/#!msg/chromium-os-dev/bRPUCFHoBTQ/ZjB8kjjx1vUJ (From OE-Core rev: 927fad7881841a58e1d88f3a6ce070eaa66ba1a5) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch44
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.18.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch b/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch
new file mode 100644
index 0000000000..47385a582b
--- /dev/null
+++ b/meta/recipes-devtools/mtools/mtools/0001-remove-LOCK_NB-to-use-blocking-request.patch
@@ -0,0 +1,44 @@
1From 5bdbfe0a63fed48104b17412854b26ee2275869a Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 22 Aug 2018 16:54:39 +0800
4Subject: [PATCH] remove LOCK_NB to use blocking request
5
6While invoking mtools frequently, the unblocking request
7caused race issue. Here is an example of syslinux
8[snip]
9dd if=/dev/zero of=floppy.img bs=1024 count=144
10losetup /dev/loop1 floppy.img
11mkdosfs /dev/loop1
12syslinux -i /dev/loop1
13|plain floppy: device "/proc/6351/fd/3" busy (Resource temporarily unavailable):
14|Cannot initialize 'S:'
15|Bad target s:/ldlinux.sys
16[snip]
17
18The idea is from:
19https://bugzilla.redhat.com/show_bug.cgi?id=1235016
20https://groups.google.com/a/chromium.org/forum/#!msg/chromium-os-dev/bRPUCFHoBTQ/ZjB8kjjx1vUJ
21
22Upstream-Status: Pending
23
24Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
25---
26 lockdev.h | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/lockdev.h b/lockdev.h
30index 4467bc2..5a135ad 100644
31--- a/lockdev.h
32+++ b/lockdev.h
33@@ -43,7 +43,7 @@ int lock_dev(int fd, int mode, struct device *dev)
34 return 0;
35
36 #if (defined(HAVE_FLOCK) && defined (LOCK_EX) && defined(LOCK_NB))
37- if (flock(fd, (mode ? LOCK_EX : LOCK_SH)|LOCK_NB) < 0)
38+ if (flock(fd, (mode ? LOCK_EX : LOCK_SH)) < 0)
39 #else /* FLOCK */
40
41 #if (defined(HAVE_LOCKF) && defined(F_TLOCK))
42--
432.7.4
44
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
index dcd32ed94c..91f7b7c610 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
@@ -31,6 +31,7 @@ SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
31 file://mtools-makeinfo.patch \ 31 file://mtools-makeinfo.patch \
32 file://no-x11.gplv3.patch \ 32 file://no-x11.gplv3.patch \
33 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \ 33 file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \
34 file://0001-remove-LOCK_NB-to-use-blocking-request.patch \
34 " 35 "
35 36
36SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" 37SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch"