blob: 47385a582bf33fbca3c0c1e5fb54a59c54672694 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 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