mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 09:31:09 +00:00
gfs2: Minor retry logic cleanup
[ Upstream commit 124c458a40
]
Clean up the retry logic in the read and write functions somewhat.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
e4ea3286b1
commit
fe24959a79
1 changed files with 16 additions and 18 deletions
|
@ -858,9 +858,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;
|
||||
goto retry_under_glock;
|
||||
if (gfs2_holder_queued(gh))
|
||||
goto retry_under_glock;
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
if (gfs2_holder_queued(gh))
|
||||
|
@ -927,9 +927,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;
|
||||
goto retry_under_glock;
|
||||
if (gfs2_holder_queued(gh))
|
||||
goto retry_under_glock;
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
out:
|
||||
|
@ -996,12 +996,11 @@ 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 (written)
|
||||
goto out_uninit;
|
||||
goto retry;
|
||||
}
|
||||
goto retry_under_glock;
|
||||
if (gfs2_holder_queued(&gh))
|
||||
goto retry_under_glock;
|
||||
if (written)
|
||||
goto out_uninit;
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
if (gfs2_holder_queued(&gh))
|
||||
|
@ -1075,12 +1074,11 @@ 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 (read)
|
||||
goto out_uninit;
|
||||
goto retry;
|
||||
}
|
||||
goto retry_under_glock;
|
||||
if (gfs2_holder_queued(gh))
|
||||
goto retry_under_glock;
|
||||
if (read)
|
||||
goto out_uninit;
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
out_unlock:
|
||||
|
|
Loading…
Reference in a new issue