diff options
| author | Christoph Hellwig <hch@lst.de> | 2025-05-07 06:48:53 +0200 |
|---|---|---|
| committer | Anna Schumaker <anna.schumaker@oracle.com> | 2025-05-28 17:17:13 -0400 |
| commit | 66a49813501c77700a7fe504e0d28aa126b115cb (patch) | |
| tree | 35cdfb8f7abadc1767f5181963ac27706120bc84 /fs/nfs/write.c | |
| parent | 66beed5acaf27137007459e7e53bf8d6f1b799cc (diff) | |
| download | linux-66a49813501c77700a7fe504e0d28aa126b115cb.tar.gz linux-66a49813501c77700a7fe504e0d28aa126b115cb.tar.bz2 linux-66a49813501c77700a7fe504e0d28aa126b115cb.zip | |
nfs: refactor nfs_do_writepage
Use early returns wherever possible to simplify the code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 4e1d57b63a85..68c5dc061abe 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -636,16 +636,15 @@ static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc, struct nfs_pageio_descriptor *pgio) { struct nfs_page *req; - int ret = 0; + int ret; nfs_pageio_cond_complete(pgio, folio->index); req = nfs_lock_and_join_requests(folio); if (!req) - goto out; - ret = PTR_ERR(req); + return 0; if (IS_ERR(req)) - goto out; + return PTR_ERR(req); nfs_folio_set_writeback(folio); WARN_ON_ONCE(test_bit(PG_CLEAN, &req->wb_flags)); @@ -655,7 +654,6 @@ static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc, if (nfs_error_is_fatal_on_server(ret)) goto out_launder; - ret = 0; if (!nfs_pageio_add_request(pgio, req)) { ret = pgio->pg_error; /* @@ -666,11 +664,12 @@ static int nfs_do_writepage(struct folio *folio, struct writeback_control *wbc, folio_redirty_for_writepage(wbc, folio); nfs_redirty_request(req); pgio->pg_error = 0; - } else - nfs_add_stats(folio->mapping->host, - NFSIOS_WRITEPAGES, 1); -out: - return ret; + return ret; + } + + nfs_add_stats(folio->mapping->host, NFSIOS_WRITEPAGES, 1); + return 0; + out_launder: nfs_write_error(req, ret); return 0; |