nilfs2-convert-segment-usage-file-to-be-folio-based.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert segment usage file to be folio-based
has been removed from the -mm tree. Its filename was
nilfs2-convert-segment-usage-file-to-be-folio-based.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: convert segment usage file to be folio-based
Date: Thu, 24 Oct 2024 18:25:37 +0900
For the sufile, which is a metadata file that holds information about managing segments, convert the page-based implementation to a folio-based implementation.
kmap_local_page() is changed to use kmap_local_folio(), and where offsets within a page are calculated using bh_offset(), are replaced with calculations using offset_in_folio() with an additional helper function nilfs_sufile_segment_usage_offset().
---
fs/nilfs2/sufile.c | 160 ++++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 78 deletions(-)
fs/nilfs2/sufile.c renamed from fs/nilfs2/sufile.c~nilfs2-convert-segment-usage-file-to-be-folio-based +82 -78
@@ -70,11 +70,20 @@ nilfs_sufile_segment_usages_in_block(con max - curr + 1); } -static struct nilfs_segment_usage * -nilfs_sufile_block_get_segment_usage (const struct inode *sufile,__u64 segnum, -struct buffer_head *bh,void *kaddr) +/** +* nilfs_sufile_segment_usage_offset - calculate the byte offset of a segment +* usage entry in the folio containing it +* @sufile: segment usage file inode +* @segnum: number of segment usage +* @bh: buffer head of block containing segment usage indexed by @segnum +* +* Return: Byte offset in the folio of the segment usage entry. +*/ +static size_t nilfs_sufile_segment_usage_offset (const struct inode *sufile, +__u64 segnum, +struct buffer_head *bh) { -return kaddr +bh_offset (bh) + +return offset_in_folio (bh->b_folio, bh->b_data) +nilfs_sufile_get_offset (sufile, segnum) *NILFS_MDT (sufile)->mi_entry_size; }
@@ -112,13 +121,11 @@ static void nilfs_sufile_mod_counter(str u64 ncleanadd, u64 ndirtyadd) {struct nilfs_sufile_header *header; -void *kaddr; - kaddr =kmap_local_page (header_bh->b_page); - header = kaddr +bh_offset (header_bh); + header =kmap_local_folio (header_bh->b_folio,0 );le64_add_cpu (&header->sh_ncleansegs, ncleanadd);le64_add_cpu (&header->sh_ndirtysegs, ndirtyadd); -kunmap_local (kaddr); +kunmap_local (header);mark_buffer_dirty (header_bh); }
@@ -313,6 +320,7 @@ int nilfs_sufile_alloc(struct inode *sufstruct nilfs_sufile_info *sui =NILFS_SUI (sufile);size_t susz =NILFS_MDT (sufile)->mi_entry_size;__u64 segnum, maxsegnum, last_alloc; +size_t offset;void *kaddr;unsigned long nsegments, nsus, cnt;int ret, j;
@@ -322,10 +330,9 @@ int nilfs_sufile_alloc(struct inode *suf ret =nilfs_sufile_get_header_block (sufile, &header_bh);if (ret <0 ) goto out_sem; - kaddr =kmap_local_page (header_bh->b_page); - header = kaddr +bh_offset (header_bh); + header =kmap_local_folio (header_bh->b_folio,0 ); last_alloc =le64_to_cpu (header->sh_last_alloc); -kunmap_local (kaddr); +kunmap_local (header); nsegments =nilfs_sufile_get_nsegments (sufile); maxsegnum = sui->allocmax;
@@ -359,9 +366,10 @@ int nilfs_sufile_alloc(struct inode *suf &su_bh);if (ret <0 ) goto out_header; - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage ( - sufile, segnum, su_bh, kaddr); + + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, + su_bh); + su = kaddr =kmap_local_folio (su_bh->b_folio, offset); nsus =nilfs_sufile_segment_usages_in_block ( sufile, segnum, maxsegnum);
@@ -372,12 +380,11 @@ int nilfs_sufile_alloc(struct inode *sufnilfs_segment_usage_set_dirty (su);kunmap_local (kaddr); - kaddr =kmap_local_page (header_bh->b_page); - header = kaddr +bh_offset (header_bh); + header =kmap_local_folio (header_bh->b_folio,0 );le64_add_cpu (&header->sh_ncleansegs,-1 );le64_add_cpu (&header->sh_ndirtysegs,1 ); header->sh_last_alloc =cpu_to_le64 (segnum); -kunmap_local (kaddr); +kunmap_local (header); sui->ncleansegs--;mark_buffer_dirty (header_bh);
@@ -411,18 +418,18 @@ void nilfs_sufile_do_cancel_free(struct struct buffer_head *su_bh) {struct nilfs_segment_usage *su; -void *kaddr; +size_t offset; - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, su_bh); + su =kmap_local_folio (su_bh->b_folio, offset);if (unlikely (!nilfs_segment_usage_clean (su))) {nilfs_warn (sufile->i_sb,"%s: segment %llu must be clean" , __func__, (unsigned long long )segnum); -kunmap_local (kaddr); +kunmap_local (su);return ; }nilfs_segment_usage_set_dirty (su); -kunmap_local (kaddr); +kunmap_local (su);nilfs_sufile_mod_counter (header_bh,-1 ,1 );NILFS_SUI (sufile)->ncleansegs--;
@@ -436,14 +443,14 @@ void nilfs_sufile_do_scrap(struct inode struct buffer_head *su_bh) {struct nilfs_segment_usage *su; -void *kaddr; +size_t offset;int clean, dirty; - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, su_bh); + su =kmap_local_folio (su_bh->b_folio, offset);if (su->su_flags ==cpu_to_le32 (BIT (NILFS_SEGMENT_USAGE_DIRTY )) && su->su_nblocks ==cpu_to_le32 (0 )) { -kunmap_local (kaddr); +kunmap_local (su);return ; } clean =nilfs_segment_usage_clean (su);
@@ -453,7 +460,7 @@ void nilfs_sufile_do_scrap(struct inode su->su_lastmod =cpu_to_le64 (0 ); su->su_nblocks =cpu_to_le32 (0 ); su->su_flags =cpu_to_le32 (BIT (NILFS_SEGMENT_USAGE_DIRTY )); -kunmap_local (kaddr); +kunmap_local (su);nilfs_sufile_mod_counter (header_bh, clean ? (u64)-1 :0 , dirty ?0 :1 );NILFS_SUI (sufile)->ncleansegs -= clean;
@@ -467,15 +474,15 @@ void nilfs_sufile_do_free(struct inode * struct buffer_head *su_bh) {struct nilfs_segment_usage *su; -void *kaddr; +size_t offset;int sudirty; - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, su_bh); + su =kmap_local_folio (su_bh->b_folio, offset);if (nilfs_segment_usage_clean (su)) {nilfs_warn (sufile->i_sb,"%s: segment %llu is already clean" , __func__, (unsigned long long )segnum); -kunmap_local (kaddr); +kunmap_local (su);return ; }if (unlikely (nilfs_segment_usage_error (su)))
@@ -488,7 +495,7 @@ void nilfs_sufile_do_free(struct inode * (unsigned long long)segnum);nilfs_segment_usage_set_clean (su); -kunmap_local (kaddr); +kunmap_local (su);mark_buffer_dirty (su_bh);nilfs_sufile_mod_counter (header_bh,1 , sudirty ? (u64)-1 :0 );
@@ -507,7 +514,7 @@ void nilfs_sufile_do_free(struct inode *int nilfs_sufile_mark_dirty (struct inode *sufile,__u64 segnum) {struct buffer_head *bh; -void *kaddr; +size_t offset;struct nilfs_segment_usage *su;int ret;
@@ -523,12 +530,12 @@ int nilfs_sufile_mark_dirty(struct inode goto out_sem; } - kaddr =kmap_local_page (bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, bh); + su =kmap_local_folio (bh->b_folio, offset);if (unlikely (nilfs_segment_usage_error (su))) {struct the_nilfs *nilfs = sufile->i_sb->s_fs_info; -kunmap_local (kaddr); +kunmap_local (su);brelse (bh);if (nilfs_segment_is_active (nilfs, segnum)) { nilfs_error(sufile->i_sb,
@@ -546,7 +553,7 @@ int nilfs_sufile_mark_dirty(struct inode ret = -EIO ; }else {nilfs_segment_usage_set_dirty (su); -kunmap_local (kaddr); +kunmap_local (su);mark_buffer_dirty (bh);nilfs_mdt_mark_dirty (sufile);brelse (bh);
@@ -568,7 +575,7 @@ int nilfs_sufile_set_segment_usage(struc {struct buffer_head *bh;struct nilfs_segment_usage *su; -void *kaddr; +size_t offset;int ret;down_write (&NILFS_MDT (sufile)->mi_sem);
@@ -576,8 +583,8 @@ int nilfs_sufile_set_segment_usage(strucif (ret <0 ) goto out_sem; - kaddr =kmap_local_page (bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, bh); + su =kmap_local_folio (bh->b_folio, offset);if (modtime) {/* * Check segusage error and set su_lastmod only when updating
@@ -587,7 +594,7 @@ int nilfs_sufile_set_segment_usage(struc su->su_lastmod =cpu_to_le64 (modtime); } su->su_nblocks =cpu_to_le32 (nblocks); -kunmap_local (kaddr); +kunmap_local (su);mark_buffer_dirty (bh);nilfs_mdt_mark_dirty (sufile);
@@ -619,7 +626,6 @@ int nilfs_sufile_get_stat(struct inode *struct buffer_head *header_bh;struct nilfs_sufile_header *header;struct the_nilfs *nilfs = sufile->i_sb->s_fs_info; -void *kaddr;int ret;down_read (&NILFS_MDT (sufile)->mi_sem);
@@ -628,8 +634,7 @@ int nilfs_sufile_get_stat(struct inode *if (ret <0 ) goto out_sem; - kaddr =kmap_local_page (header_bh->b_page); - header = kaddr +bh_offset (header_bh); + header =kmap_local_folio (header_bh->b_folio,0 ); sustat->ss_nsegs =nilfs_sufile_get_nsegments (sufile); sustat->ss_ncleansegs =le64_to_cpu (header->sh_ncleansegs); sustat->ss_ndirtysegs =le64_to_cpu (header->sh_ndirtysegs);
@@ -638,7 +643,7 @@ int nilfs_sufile_get_stat(struct inode *spin_lock (&nilfs->ns_last_segment_lock); sustat->ss_prot_seq = nilfs->ns_prot_seq;spin_unlock (&nilfs->ns_last_segment_lock); -kunmap_local (kaddr); +kunmap_local (header);brelse (header_bh); out_sem:
@@ -651,18 +656,18 @@ void nilfs_sufile_do_set_error(struct in struct buffer_head *su_bh) {struct nilfs_segment_usage *su; -void *kaddr; +size_t offset;int suclean; - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, su_bh); + su =kmap_local_folio (su_bh->b_folio, offset);if (nilfs_segment_usage_error (su)) { -kunmap_local (kaddr); +kunmap_local (su);return ; } suclean =nilfs_segment_usage_clean (su);nilfs_segment_usage_set_error (su); -kunmap_local (kaddr); +kunmap_local (su);if (suclean) {nilfs_sufile_mod_counter (header_bh,-1 ,0 );
@@ -700,7 +705,7 @@ static int nilfs_sufile_truncate_range(sunsigned long segusages_per_block;unsigned long nsegs, ncleaned;__u64 segnum; -void *kaddr; +size_t offset;ssize_t n, nc;int ret;int j;
@@ -731,16 +736,16 @@ static int nilfs_sufile_truncate_range(s/* hole */ continue ; } - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage ( - sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, + su_bh); + su =kmap_local_folio (su_bh->b_folio, offset); su2 = su;for (j =0 ; j < n; j++, su = (void *)su + susz) {if ((le32_to_cpu (su->su_flags) & ~BIT (NILFS_SEGMENT_USAGE_ERROR )) ||nilfs_segment_is_active (nilfs, segnum + j)) { ret = -EBUSY ; -kunmap_local (kaddr); +kunmap_local (su2);brelse (su_bh); goto out_header; }
@@ -752,7 +757,7 @@ static int nilfs_sufile_truncate_range(s nc++; } } -kunmap_local (kaddr); +kunmap_local (su2);if (nc >0 ) {mark_buffer_dirty (su_bh); ncleaned += nc;
@@ -799,7 +804,6 @@ int nilfs_sufile_resize(struct inode *sustruct buffer_head *header_bh;struct nilfs_sufile_header *header;struct nilfs_sufile_info *sui =NILFS_SUI (sufile); -void *kaddr;unsigned long nsegs, nrsvsegs;int ret =0 ;
@@ -837,10 +841,9 @@ int nilfs_sufile_resize(struct inode *su sui->allocmin =0 ; } - kaddr =kmap_local_page (header_bh->b_page); - header = kaddr +bh_offset (header_bh); + header =kmap_local_folio (header_bh->b_folio,0 ); header->sh_ncleansegs =cpu_to_le64 (sui->ncleansegs); -kunmap_local (kaddr); +kunmap_local (header);mark_buffer_dirty (header_bh);nilfs_mdt_mark_dirty (sufile);
@@ -874,6 +877,7 @@ ssize_t nilfs_sufile_get_suinfo(struct istruct nilfs_suinfo *si = buf;size_t susz =NILFS_MDT (sufile)->mi_entry_size;struct the_nilfs *nilfs = sufile->i_sb->s_fs_info; +size_t offset;void *kaddr;unsigned long nsegs, segusages_per_block;ssize_t n;
@@ -901,9 +905,9 @@ ssize_t nilfs_sufile_get_suinfo(struct icontinue ; } - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage ( - sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, + su_bh); + su = kaddr =kmap_local_folio (su_bh->b_folio, offset);for (j =0 ; j < n; j++, su = (void *)su + susz, si = (void *)si + sisz) { si->sui_lastmod =le64_to_cpu (su->su_lastmod);
@@ -951,7 +955,7 @@ ssize_t nilfs_sufile_set_suinfo(struct istruct buffer_head *header_bh, *bh;struct nilfs_suinfo_update *sup, *supend = buf + supsz * nsup;struct nilfs_segment_usage *su; -void *kaddr; +size_t offset;unsigned long blkoff, prev_blkoff;int cleansi, cleansu, dirtysi, dirtysu;long ncleaned =0 , ndirtied =0 ;
@@ -983,9 +987,9 @@ ssize_t nilfs_sufile_set_suinfo(struct i goto out_header;for (;;) { - kaddr =kmap_local_page (bh->b_page); - su =nilfs_sufile_block_get_segment_usage ( - sufile, sup->sup_segnum, bh, kaddr); + offset =nilfs_sufile_segment_usage_offset ( + sufile, sup->sup_segnum, bh); + su =kmap_local_folio (bh->b_folio, offset);if (nilfs_suinfo_update_lastmod (sup)) su->su_lastmod =cpu_to_le64 (sup->sup_sui.sui_lastmod);
@@ -1020,7 +1024,7 @@ ssize_t nilfs_sufile_set_suinfo(struct i su->su_flags =cpu_to_le32 (sup->sup_sui.sui_flags); } -kunmap_local (kaddr); +kunmap_local (su); sup = (void *)sup + supsz;if (sup >= supend)
@@ -1076,6 +1080,7 @@ int nilfs_sufile_trim_fs(struct inode *sstruct the_nilfs *nilfs = sufile->i_sb->s_fs_info;struct buffer_head *su_bh;struct nilfs_segment_usage *su; +size_t offset;void *kaddr;size_t n, i, susz =NILFS_MDT (sufile)->mi_entry_size;sector_t seg_start, seg_end, start_block, end_block;
@@ -1125,9 +1130,9 @@ int nilfs_sufile_trim_fs(struct inode *scontinue ; } - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage (sufile, segnum, - su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset (sufile, segnum, + su_bh); + su = kaddr =kmap_local_folio (su_bh->b_folio, offset);for (i =0 ; i < n; ++i, ++segnum, su = (void *)su + susz) {if (!nilfs_segment_usage_clean (su))continue ;
@@ -1167,9 +1172,10 @@ int nilfs_sufile_trim_fs(struct inode *s } ndiscarded += nblocks; - kaddr =kmap_local_page (su_bh->b_page); - su =nilfs_sufile_block_get_segment_usage ( - sufile, segnum, su_bh, kaddr); + offset =nilfs_sufile_segment_usage_offset ( + sufile, segnum, su_bh); + su = kaddr =kmap_local_folio (su_bh->b_folio, + offset); }/* start new extent */
@@ -1221,7 +1227,6 @@ int nilfs_sufile_read(struct super_blockstruct nilfs_sufile_info *sui;struct buffer_head *header_bh;struct nilfs_sufile_header *header; -void *kaddr;int err;if (susize > sb->s_blocksize) {
@@ -1262,10 +1267,9 @@ int nilfs_sufile_read(struct super_block } sui =NILFS_SUI (sufile); - kaddr =kmap_local_page (header_bh->b_page); - header = kaddr +bh_offset (header_bh); + header =kmap_local_folio (header_bh->b_folio,0 ); sui->ncleansegs =le64_to_cpu (header->sh_ncleansegs); -kunmap_local (kaddr); +kunmap_local (header);brelse (header_bh); sui->allocmax =nilfs_sufile_get_nsegments (sufile) -1 ;
_
Patches currently in -mm which might be from [email protected] are