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

isofs: Convert rock_ridge_symlink_read_folio to use a folio 



Remove the conversion back into a page and use the folio APIs throughout.
Remove the setting of PG_error instead of converting it; it is unused
by core code or by the rest of isofs, so it serves no purpose here.
Use folio_end_read() to save an atomic operation and unify the two
exit paths.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20240530202110.2653630-7-willy@infradead.org


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

fs/isofs/rock.c

+8 −9
Original line number Diff line number Diff line
@@ -688,11 +688,10 @@ int parse_rock_ridge_inode(struct iso_directory_record *de, struct inode *inode, 
 */

static int rock_ridge_symlink_read_folio(struct file *file, struct folio *folio)

{

	struct page *page = &folio->page;

	struct inode *inode = page->mapping->host;

	struct inode *inode = folio->mapping->host;

	struct iso_inode_info *ei = ISOFS_I(inode);

	struct isofs_sb_info *sbi = ISOFS_SB(inode->i_sb);

	char *link = page_address(page);

	char *link = folio_address(folio);

	unsigned long bufsize = ISOFS_BUFFER_SIZE(inode);

	struct buffer_head *bh;

	char *rpnt = link;
@@ -779,9 +778,10 @@ static int rock_ridge_symlink_read_folio(struct file *file, struct folio *folio) 
		goto fail;

	brelse(bh);

	*rpnt = '\0';

	SetPageUptodate(page);

	unlock_page(page);

	return 0;

	ret = 0;

end:

	folio_end_read(folio, ret == 0);

	return ret;



	/* error exit from macro */

out:
@@ -795,9 +795,8 @@ static int rock_ridge_symlink_read_folio(struct file *file, struct folio *folio) 
fail:

	brelse(bh);

error:

	SetPageError(page);

	unlock_page(page);

	return -EIO;

	ret = -EIO;

	goto end;

}



const struct address_space_operations isofs_symlink_aops = {