Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b6c1bd9 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

Gracefully handle ENODEV in sdcard daemon (part deux) 

reorder to handle errno correctly and remove log stutter

Bug: 22197797
Bug: 22241640
Change-Id: I81e6b2ff15b6ea6e5e780bd3599bf1019ff36f26
parent a65e402b

sdcard/sdcard.c

+3 −5
Original line number Diff line number Diff line
@@ -1513,16 +1513,14 @@ static void handle_fuse_requests(struct fuse_handler* handler) 
{

    struct fuse* fuse = handler->fuse;

    for (;;) {

        ssize_t len = read(fuse->fd,

                handler->request_buffer, sizeof(handler->request_buffer));

        ssize_t len = TEMP_FAILURE_RETRY(read(fuse->fd,

                handler->request_buffer, sizeof(handler->request_buffer)));

        if (len < 0) {

            if (errno != EINTR) {

                ERROR("[%d] handle_fuse_requests: errno=%d\n", handler->token, errno);

            }

            if (errno == ENODEV) {

                ERROR("[%d] someone stole our marbles!\n", handler->token);

                exit(2);

            }

            ERROR("[%d] handle_fuse_requests: errno=%d\n", handler->token, errno);

            continue;

        }