Commit cea44032 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

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: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 6fa0a72c

fs/gfs2/aops.c

+7 −4
Original line number Diff line number Diff line
@@ -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);