Commit 45d76698 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Richard Weinberger
Browse files

ubifs: Convert cancel_budget() to take a folio 



The one caller already has a folio, so pass it in instead of the page.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent a3c2f196

fs/ubifs/file.c

+5 −5
Original line number Diff line number Diff line
@@ -499,14 +499,14 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping, 
/**

 * cancel_budget - cancel budget.

 * @c: UBIFS file-system description object

 * @page: page to cancel budget for

 * @folio: folio to cancel budget for

 * @ui: UBIFS inode object the page belongs to

 * @appending: non-zero if the page is appended

 *

 * This is a helper function for a page write operation. It unlocks the

 * @ui->ui_mutex in case of appending.

 */

static void cancel_budget(struct ubifs_info *c, struct page *page,

static void cancel_budget(struct ubifs_info *c, struct folio *folio,

			  struct ubifs_inode *ui, int appending)

{

	if (appending) {
@@ -514,8 +514,8 @@ static void cancel_budget(struct ubifs_info *c, struct page *page, 
			ubifs_release_dirty_inode_budget(c, ui);

		mutex_unlock(&ui->ui_mutex);

	}

	if (!PagePrivate(page)) {

		if (PageChecked(page))

	if (!folio->private) {

		if (folio_test_checked(folio))

			release_new_page_budget(c);

		else

			release_existing_page_budget(c);
@@ -548,7 +548,7 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping, 
		 */

		dbg_gen("copied %d instead of %d, read page and repeat",

			copied, len);

		cancel_budget(c, &folio->page, ui, appending);

		cancel_budget(c, folio, ui, appending);

		folio_clear_checked(folio);



		/*