am 609c7acd: am 6b6c1bd9: Gracefully handle ENODEV in sdcard daemon (part deux)

* commit '609c7acd085531cef1d176162b0476e5013c0769':
  Gracefully handle ENODEV in sdcard daemon (part deux)
This commit is contained in:
Mark Salyzyn 2015-07-07 00:33:05 +00:00 committed by Android Git Automerger
commit ca0b823338

View file

@ -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;
}