]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFS: remove sync_mode test from nfs_writepage_locked()
authorNeilBrown <neilb@suse.de>
Tue, 27 Feb 2024 23:05:07 +0000 (10:05 +1100)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Sat, 9 Mar 2024 14:14:51 +0000 (09:14 -0500)
nfs_writepage_locked() is only called from nfs_wb_folio() (since Commit
12fc0a963128 ("nfs: Remove writepage")) so ->sync_mode is always
WB_SYNC_ALL.

This means the test for WB_SYNC_NONE is dead code and can be removed.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/write.c

index bb79d3a886ae83d15395371ec735b7d0e6075bae..58adbb7709ba7205055fc2b6254e65e5bdd49ab9 100644 (file)
@@ -667,10 +667,6 @@ static int nfs_writepage_locked(struct folio *folio,
        struct inode *inode = folio_file_mapping(folio)->host;
        int err;
 
-       if (wbc->sync_mode == WB_SYNC_NONE &&
-           NFS_SERVER(inode)->write_congested)
-               return AOP_WRITEPAGE_ACTIVATE;
-
        nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGE);
        nfs_pageio_init_write(&pgio, inode, 0, false,
                              &nfs_async_write_completion_ops);