Commit 4a2316a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v5.18-rc4-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fix from Andreas Gruenbacher:

 - No short reads or writes upon glock contention

* tag 'gfs2-v5.18-rc4-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: No short reads or writes upon glock contention
parents 8061e16e 296abc0d

fs/gfs2/file.c

+0 −4
Original line number Diff line number Diff line
@@ -991,8 +991,6 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		if (leftover != window_size) {

			if (gfs2_holder_queued(&gh))

				goto retry_under_glock;

			if (written)

				goto out_uninit;

			goto retry;

		}

	}
@@ -1069,8 +1067,6 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb, 
			from->count = min(from->count, window_size - leftover);

			if (gfs2_holder_queued(gh))

				goto retry_under_glock;

			if (read && !(iocb->ki_flags & IOCB_DIRECT))

				goto out_uninit;

			goto retry;

		}

	}