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

Commit 1d75eb0d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: swap: fix swapcache usage for fast swap devices"

parents cac2c07b 0f206f91

mm/swap_state.c

+2 −3
Original line number Diff line number Diff line
@@ -463,11 +463,10 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask, 
	unsigned long entry_offset = swp_offset(entry);

	unsigned long offset = entry_offset;

	unsigned long start_offset, end_offset;

	unsigned long mask = is_swap_fast(entry) ? 0 :

				(1UL << page_cluster) - 1;

	unsigned long mask;

	struct blk_plug plug;



	mask = swapin_nr_pages(offset) - 1;

	mask = is_swap_fast(entry) ? 0 : swapin_nr_pages(offset) - 1;

	if (!mask)

		goto skip;

mm/swapfile.c

+3 −3
Original line number Diff line number Diff line
@@ -2523,10 +2523,10 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
				pr_err("swapon: discard_swap(%p): %d\n",

					p, err);

		}

	}



		if (blk_queue_fast(bdev_get_queue(p->bdev)))

	if (p->bdev && blk_queue_fast(bdev_get_queue(p->bdev)))

		p->flags |= SWP_FAST;

	}



	mutex_lock(&swapon_mutex);

	prio = -1;