Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 5bdbfe0a63fed48104b17412854b26ee2275869a Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 22 Aug 2018 16:54:39 +0800 |
| 4 | Subject: [PATCH] remove LOCK_NB to use blocking request |
| 5 | |
| 6 | While invoking mtools frequently, the unblocking request |
| 7 | caused race issue. Here is an example of syslinux |
| 8 | [snip] |
| 9 | dd if=/dev/zero of=floppy.img bs=1024 count=144 |
| 10 | losetup /dev/loop1 floppy.img |
| 11 | mkdosfs /dev/loop1 |
| 12 | syslinux -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 | |
| 18 | The idea is from: |
| 19 | https://bugzilla.redhat.com/show_bug.cgi?id=1235016 |
| 20 | https://groups.google.com/a/chromium.org/forum/#!msg/chromium-os-dev/bRPUCFHoBTQ/ZjB8kjjx1vUJ |
| 21 | |
| 22 | Upstream-Status: Pending |
| 23 | |
| 24 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 25 | --- |
| 26 | lockdev.h | 2 +- |
| 27 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 28 | |
| 29 | diff --git a/lockdev.h b/lockdev.h |
| 30 | index 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 | -- |
| 43 | 2.7.4 |
| 44 | |