Merge "mm: swap_ratio: bail out if there aren't any other swap device" (45b8dd2a) · Commits · e / devices / android_kernel_fairphone_FP4

mm/swap_ratio.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,12 @@ static int swap_ratio_slow(struct swap_info_struct **si, int node)
		n = plist_next_entry(&(*si)->avail_lists[node],
		struct swap_info_struct,
		avail_lists[node]);
		if (n == *si) {
		/* No other swap device */
		ret = -ENODEV;
		goto skip;
		}

		spin_unlock(&swap_avail_lock);
		spin_lock(&n->lock);
		spin_lock(&swap_avail_lock);
		@@ -175,6 +181,9 @@ void setup_swap_ratio(struct swap_info_struct *p, int prio)

		int swap_ratio(struct swap_info_struct **si, int node)
		{
		if (!sysctl_swap_ratio_enable)
		return -ENODEV;

		if (is_swap_ratio_group((*si)->prio))
		return swap_ratio_slow(si, node);
		else