Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66cb4625 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm, swap: introduce SWP_SYNCHRONOUS_IO"

parents c9f0f6a6 ef97cef2

include/linux/swap.h

+2 −1
Original line number Diff line number Diff line
@@ -171,8 +171,9 @@ enum { 
	SWP_AREA_DISCARD = (1 << 8),	/* single-time swap area discards */

	SWP_PAGE_DISCARD = (1 << 9),	/* freed swap page-cluster discards */

	SWP_STABLE_WRITES = (1 << 10),	/* no overwrite PG_writeback pages */

	SWP_SYNCHRONOUS_IO = (1 << 11),	/* synchronous IO is efficient */

					/* add others here before... */

	SWP_SCANNING	= (1 << 11),	/* refcount in scan_swap_map */

	SWP_SCANNING	= (1 << 12),	/* refcount in scan_swap_map */

};



#define SWAP_CLUSTER_MAX 32UL

mm/swapfile.c

+3 −0
Original line number Diff line number Diff line
@@ -3169,6 +3169,9 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
	if (bdi_cap_stable_pages_required(inode_to_bdi(inode)))

		p->flags |= SWP_STABLE_WRITES;



	if (bdi_cap_synchronous_io(inode_to_bdi(inode)))

		p->flags |= SWP_SYNCHRONOUS_IO;



	if (p->bdev && blk_queue_nonrot(bdev_get_queue(p->bdev))) {

		int cpu;

		unsigned long ci, nr_cluster;