Commit 4522ae2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ubifs-for-linus-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs 

Pull UBI and UBIFS updates from Richard Weinberger:
 "UBIFS:
   - No longer use write_cache_pages()

  UBI:
   - Remove an unused function"

* tag 'ubifs-for-linus-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubifs: stop using write_cache_pages
  mtd: ubi: Remove unused ubi_flush
parents ff7dcfed 99dbb2a1

drivers/mtd/ubi/kapi.c

+0 −27
Original line number Diff line number Diff line
@@ -791,33 +791,6 @@ int ubi_sync(int ubi_num) 
}

EXPORT_SYMBOL_GPL(ubi_sync);



/**

 * ubi_flush - flush UBI work queue.

 * @ubi_num: UBI device to flush work queue

 * @vol_id: volume id to flush for

 * @lnum: logical eraseblock number to flush for

 *

 * This function executes all pending works for a particular volume id / logical

 * eraseblock number pair. If either value is set to %UBI_ALL, then it acts as

 * a wildcard for all of the corresponding volume numbers or logical

 * eraseblock numbers. It returns zero in case of success and a negative error

 * code in case of failure.

 */

int ubi_flush(int ubi_num, int vol_id, int lnum)

{

	struct ubi_device *ubi;

	int err = 0;



	ubi = ubi_get_device(ubi_num);

	if (!ubi)

		return -ENODEV;



	err = ubi_wl_flush(ubi, vol_id, lnum);

	ubi_put_device(ubi);

	return err;

}

EXPORT_SYMBOL_GPL(ubi_flush);



BLOCKING_NOTIFIER_HEAD(ubi_notifiers);



/**

fs/ubifs/file.c

+7 −3
Original line number Diff line number Diff line
@@ -979,8 +979,7 @@ static int do_writepage(struct folio *folio, size_t len) 
 * on the page lock and it would not write the truncated inode node to the

 * journal before we have finished.

 */

static int ubifs_writepage(struct folio *folio, struct writeback_control *wbc,

		void *data)

static int ubifs_writepage(struct folio *folio, struct writeback_control *wbc)

{

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

	struct ubifs_info *c = inode->i_sb->s_fs_info;
@@ -1052,7 +1051,12 @@ static int ubifs_writepage(struct folio *folio, struct writeback_control *wbc, 
static int ubifs_writepages(struct address_space *mapping,

		struct writeback_control *wbc)

{

	return write_cache_pages(mapping, wbc, ubifs_writepage, NULL);

	struct folio *folio = NULL;

	int error;



	while ((folio = writeback_iter(mapping, wbc, folio, &error)))

		error = ubifs_writepage(folio, wbc);

	return error;

}



/**

include/linux/mtd/ubi.h

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ int ubi_leb_unmap(struct ubi_volume_desc *desc, int lnum); 
int ubi_leb_map(struct ubi_volume_desc *desc, int lnum);

int ubi_is_mapped(struct ubi_volume_desc *desc, int lnum);

int ubi_sync(int ubi_num);

int ubi_flush(int ubi_num, int vol_id, int lnum);



/*

 * This function is the same as the 'ubi_leb_read()' function, but it does not