mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 08:33:17 +02:00
nfs: fold nfs_page_async_flush into nfs_do_writepage
Fold nfs_page_async_flush into its only caller to clean up the code a bit. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
This commit is contained in:
parent
3a3065352f
commit
b6354e60dd
|
|
@ -632,13 +632,14 @@ static void nfs_write_error(struct nfs_page *req, int error)
|
|||
* Find an associated nfs write request, and prepare to flush it out
|
||||
* May return an error if the user signalled nfs_wait_on_request().
|
||||
*/
|
||||
static int nfs_page_async_flush(struct folio *folio,
|
||||
struct writeback_control *wbc,
|
||||
struct nfs_pageio_descriptor *pgio)
|
||||
static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc,
|
||||
struct nfs_pageio_descriptor *pgio)
|
||||
{
|
||||
struct nfs_page *req;
|
||||
int ret = 0;
|
||||
|
||||
nfs_pageio_cond_complete(pgio, folio->index);
|
||||
|
||||
req = nfs_lock_and_join_requests(folio);
|
||||
if (!req)
|
||||
goto out;
|
||||
|
|
@ -677,13 +678,6 @@ static int nfs_page_async_flush(struct folio *folio,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc,
|
||||
struct nfs_pageio_descriptor *pgio)
|
||||
{
|
||||
nfs_pageio_cond_complete(pgio, folio->index);
|
||||
return nfs_page_async_flush(folio, wbc, pgio);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write an mmapped page to the server.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user