From 7dc76c9f210b3c66a9c89e6690af7b49f6c540a8 Mon Sep 17 00:00:00 2001 From: Xiaoming Ni Date: Mon, 12 Dec 2022 18:57:09 +0100 Subject: loop: simplify code of LOOP_SET_FD failure function old new delta set_loop 790 760 -30 Signed-off-by: Xiaoming Ni Signed-off-by: Denys Vlasenko --- libbb/loop.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libbb/loop.c b/libbb/loop.c index 8e5c915..256b7ac 100644 --- a/libbb/loop.c +++ b/libbb/loop.c @@ -188,13 +188,9 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse /* If device is free, try to claim it */ if (rc && errno == ENXIO) { /* Associate free loop device with file */ - if (ioctl(lfd, LOOP_SET_FD, ffd)) { - /* Ouch. Are we racing with other mount? */ - if (!*device) { - close(lfd); -//TODO: add "if (--failcount != 0) ..."? - continue; - } + rc = ioctl(lfd, LOOP_SET_FD, ffd); + if (rc != 0) { + /* Ouch... race: the device already has a fd */ goto close_and_try_next_loopN; } memset(&loopinfo, 0, sizeof(loopinfo)); -- cgit v1.1