Commit 124c458a authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Minor retry logic cleanup 



Clean up the retry logic in the read and write functions somewhat.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 52f3f033

fs/gfs2/file.c

+16 −18
Original line number Diff line number Diff line
@@ -852,9 +852,9 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to, 
		leftover = fault_in_iov_iter_writeable(to, window_size);

		gfs2_holder_disallow_demote(gh);

		if (leftover != window_size) {

			if (!gfs2_holder_queued(gh))

				goto retry;

			if (gfs2_holder_queued(gh))

				goto retry_under_glock;

			goto retry;

		}

	}

	if (gfs2_holder_queued(gh))
@@ -921,9 +921,9 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from, 
		leftover = fault_in_iov_iter_readable(from, window_size);

		gfs2_holder_disallow_demote(gh);

		if (leftover != window_size) {

			if (!gfs2_holder_queued(gh))

				goto retry;

			if (gfs2_holder_queued(gh))

				goto retry_under_glock;

			goto retry;

		}

	}

out:
@@ -992,13 +992,12 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		leftover = fault_in_iov_iter_writeable(to, window_size);

		gfs2_holder_disallow_demote(&gh);

		if (leftover != window_size) {

			if (!gfs2_holder_queued(&gh)) {

			if (gfs2_holder_queued(&gh))

				goto retry_under_glock;

			if (written)

				goto out_uninit;

			goto retry;

		}

			goto retry_under_glock;

		}

	}

	if (gfs2_holder_queued(&gh))

		gfs2_glock_dq(&gh);
@@ -1071,13 +1070,12 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb, 
		gfs2_holder_disallow_demote(gh);

		if (leftover != window_size) {

			from->count = min(from->count, window_size - leftover);

			if (!gfs2_holder_queued(gh)) {

			if (gfs2_holder_queued(gh))

				goto retry_under_glock;

			if (read)

				goto out_uninit;

			goto retry;

		}

			goto retry_under_glock;

		}

	}

out_unlock:

	if (gfs2_holder_queued(gh))