Commit ce3bb0d2 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

cifs: Convert cifs to read_folio 



This is a "weak" conversion which converts straight back to using pages.
CIFS should probably be converted to use netfs_read_folio() by someone
familiar with it.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent fb12489b

fs/cifs/file.c

+7 −6
Original line number Diff line number Diff line
@@ -4612,8 +4612,9 @@ static int cifs_readpage_worker(struct file *file, struct page *page, 
	return rc;

}



static int cifs_readpage(struct file *file, struct page *page)

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

{

	struct page *page = &folio->page;

	loff_t offset = page_file_offset(page);

	int rc = -EACCES;

	unsigned int xid;
@@ -4626,7 +4627,7 @@ static int cifs_readpage(struct file *file, struct page *page) 
		return rc;

	}



	cifs_dbg(FYI, "readpage %p at offset %d 0x%x\n",

	cifs_dbg(FYI, "read_folio %p at offset %d 0x%x\n",

		 page, (int)offset, (int)offset);



	rc = cifs_readpage_worker(file, page, &offset);
@@ -4965,7 +4966,7 @@ static bool cifs_dirty_folio(struct address_space *mapping, struct folio *folio) 
#endif



const struct address_space_operations cifs_addr_ops = {

	.readpage = cifs_readpage,

	.read_folio = cifs_read_folio,

	.readahead = cifs_readahead,

	.writepage = cifs_writepage,

	.writepages = cifs_writepages,
@@ -4986,12 +4987,12 @@ const struct address_space_operations cifs_addr_ops = { 
};



/*

 * cifs_readpages requires the server to support a buffer large enough to

 * cifs_readahead requires the server to support a buffer large enough to

 * contain the header plus one complete page of data.  Otherwise, we need

 * to leave cifs_readpages out of the address space operations.

 * to leave cifs_readahead out of the address space operations.

 */

const struct address_space_operations cifs_addr_ops_smallbuf = {

	.readpage = cifs_readpage,

	.read_folio = cifs_read_folio,

	.writepage = cifs_writepage,

	.writepages = cifs_writepages,

	.write_begin = cifs_write_begin,