From 0c693f06e35fab34bc5f0637a4b0a3a44fbb1ac1 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 4 Jun 2014 16:21:19 +0200 Subject: udev: guard REREADPT by exclusive lock instead of O_EXCL Signed-off-by: Anthony G. Basile --- src/udev/udevd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/udev/udevd.c b/src/udev/udevd.c index f0b91adab1..4e5d5df6b6 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -755,9 +755,12 @@ static int synthesize_change(struct udev_device *dev) { * partition table is found, and we will not get an event for * the disk. */ - fd = open(udev_device_get_devnode(dev), O_RDONLY|O_EXCL|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK); + fd = open(udev_device_get_devnode(dev), O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK); if (fd >= 0) { - r = ioctl(fd, BLKRRPART, 0); + r = flock(fd, LOCK_EX|LOCK_NB); + if (r >= 0) + r = ioctl(fd, BLKRRPART, 0); + close(fd); if (r >= 0) part_table_read = true; -- cgit v1.2.3-54-g00ecf