Unverified Commit 8f3ab6e4 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Christian Brauner
Browse files

nfs: Remove calls to folio_set_error 



Common code doesn't test the error flag, so we don't need to set it in
nfs.  We can use folio_end_read() to combine the setting (or not)
of the uptodate flag and clearing the lock flag.

Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20240530202110.2653630-10-willy@infradead.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent d15b00b1

fs/nfs/read.c

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ static void nfs_readpage_release(struct nfs_page *req, int error) 
{

	struct folio *folio = nfs_page_to_folio(req);



	if (nfs_error_is_fatal_on_server(error) && error != -ETIMEDOUT)

		folio_set_error(folio);

	if (nfs_page_group_sync_on_bit(req, PG_UNLOCKPAGE))

		if (nfs_netfs_folio_unlock(folio))

			folio_unlock(folio);

fs/nfs/symlink.c

+2 −10
Original line number Diff line number Diff line
@@ -32,16 +32,8 @@ static int nfs_symlink_filler(struct file *file, struct folio *folio) 
	int error;



	error = NFS_PROTO(inode)->readlink(inode, &folio->page, 0, PAGE_SIZE);

	if (error < 0)

		goto error;

	folio_mark_uptodate(folio);

	folio_unlock(folio);

	return 0;



error:

	folio_set_error(folio);

	folio_unlock(folio);

	return -EIO;

	folio_end_read(folio, error == 0);

	return error;

}



static const char *nfs_get_link(struct dentry *dentry,

fs/nfs/write.c

+0 −1
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ static void nfs_mapping_set_error(struct folio *folio, int error) 
{

	struct address_space *mapping = folio_file_mapping(folio);



	folio_set_error(folio);

	filemap_set_wb_err(mapping, error);

	if (mapping->host)

		errseq_set(&mapping->host->i_sb->s_wb_err,