From cea44032bc799b088bce1ea73c08269bb59b47d0 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 7 Jun 2023 07:19:50 -0500 Subject: [PATCH] gfs2: retry interrupted internal reads The iomap-based read operations done by gfs2 for its system files, such as rindex, may sometimes be interrupted and return -EINTR. This confuses some users of gfs2_internal_read(). Fix that by retrying interrupted reads. Signed-off-by: Bob Peterson Signed-off-by: Andreas Gruenbacher --- fs/gfs2/aops.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index d95125714ebb3..dacc21b1ae001 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -491,13 +491,16 @@ int gfs2_internal_read(struct gfs2_inode *ip, char *buf, loff_t *pos, void *p; do { - amt = size - copied; - if (offset + size > PAGE_SIZE) - amt = PAGE_SIZE - offset; page = read_cache_page(mapping, index, gfs2_read_folio, NULL); - if (IS_ERR(page)) + if (IS_ERR(page)) { + if (PTR_ERR(page) == -EINTR) + continue; return PTR_ERR(page); + } p = kmap_atomic(page); + amt = size - copied; + if (offset + size > PAGE_SIZE) + amt = PAGE_SIZE - offset; memcpy(buf + copied, p + offset, amt); kunmap_atomic(p); put_page(page); -- 2.30.2