Commit 27701521 authored by Kairui Song's avatar Kairui Song Committed by Andrew Morton
Browse files

mm, swap: clean up device availability check 

Remove highest_bit and lowest_bit.  After the HDD allocation path has been
removed, the only purpose of these two fields is to determine whether the
device is full or not, which can instead be determined by checking the
inuse_pages.

Link: https://lkml.kernel.org/r/20250113175732.48099-6-ryncsn@gmail.com


Signed-off-by: default avatarKairui Song <kasong@tencent.com>
Reviewed-by: default avatarBaoquan He <bhe@redhat.com>
Cc: Barry Song <v-songbaohua@oppo.com>
Cc: Chis Li <chrisl@kernel.org>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Hugh Dickens <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0b310d9c

fs/btrfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -10110,7 +10110,6 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file, 
	*span = bsi.highest_ppage - bsi.lowest_ppage + 1;

	sis->max = bsi.nr_pages;

	sis->pages = bsi.nr_pages - 1;

	sis->highest_bit = bsi.nr_pages - 1;

	return bsi.nr_extents;

}

#else

fs/f2fs/data.c

+0 −1
Original line number Diff line number Diff line
@@ -4043,7 +4043,6 @@ static int check_swap_activate(struct swap_info_struct *sis, 
		cur_lblock = 1;	/* force Empty message */

	sis->max = cur_lblock;

	sis->pages = cur_lblock - 1;

	sis->highest_bit = cur_lblock - 1;

out:

	if (not_aligned)

		f2fs_warn(sbi, "Swapfile (%u) is not align to section: 1) creat(), 2) ioctl(F2FS_IOC_SET_PIN_FILE), 3) fallocate(%lu * N)",

fs/iomap/swapfile.c

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ int iomap_swapfile_activate(struct swap_info_struct *sis, 
	*pagespan = 1 + isi.highest_ppage - isi.lowest_ppage;

	sis->max = isi.nr_pages;

	sis->pages = isi.nr_pages - 1;

	sis->highest_bit = isi.nr_pages - 1;

	return isi.nr_extents;

}

EXPORT_SYMBOL_GPL(iomap_swapfile_activate);

include/linux/swap.h

+0 −2
Original line number Diff line number Diff line
@@ -305,8 +305,6 @@ struct swap_info_struct { 
	struct list_head frag_clusters[SWAP_NR_ORDERS];

					/* list of cluster that are fragmented or contented */

	unsigned int frag_cluster_nr[SWAP_NR_ORDERS];

	unsigned int lowest_bit;	/* index of first free in swap_map */

	unsigned int highest_bit;	/* index of last free in swap_map */

	unsigned int pages;		/* total of usable pages of swap */

	unsigned int inuse_pages;	/* number of those currently in use */

	struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap location */

mm/page_io.c

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ int generic_swapfile_activate(struct swap_info_struct *sis, 
		page_no = 1;	/* force Empty message */

	sis->max = page_no;

	sis->pages = page_no - 1;

	sis->highest_bit = page_no - 1;

out:

	return ret;

bad_bmap: