nilfs2-convert-cpfile-to-use-kmap_local.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert cpfile to use kmap_local
has been removed from the -mm tree. Its filename was
nilfs2-convert-cpfile-to-use-kmap_local.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: convert cpfile to use kmap_local
Date: Mon, 22 Jan 2024 23:02:02 +0900
Convert all remaining usages of kmap_atomic in cpfile to kmap_local.
Signed-off-by Ryusuke Konishi <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/nilfs2/cpfile.c | 90 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-)
fs/nilfs2/cpfile.c renamed from fs/nilfs2/cpfile.c~nilfs2-convert-cpfile-to-use-kmap_local +45 -45
@@ -460,7 +460,7 @@ int nilfs_cpfile_delete_checkpoints(strucontinue ; } - kaddr =kmap_atomic (cp_bh->b_page); + kaddr =kmap_local_page (cp_bh->b_page); cp =nilfs_cpfile_block_get_checkpoint ( cpfile, cno, cp_bh, kaddr); nicps =0 ;
@@ -482,7 +482,7 @@ int nilfs_cpfile_delete_checkpoints(stru cpfile, cp_bh, kaddr, nicps);if (count ==0 ) {/* make hole */ -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (cp_bh); ret = nilfs_cpfile_delete_checkpoint_block(
@@ -497,18 +497,18 @@ int nilfs_cpfile_delete_checkpoints(stru } } -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (cp_bh); }if (tnicps >0 ) { - kaddr =kmap_atomic (header_bh->b_page); + kaddr =kmap_local_page (header_bh->b_page); header =nilfs_cpfile_block_get_header (cpfile, header_bh, kaddr);le64_add_cpu (&header->ch_ncheckpoints, -(u64 )tnicps);mark_buffer_dirty (header_bh);nilfs_mdt_mark_dirty (cpfile); -kunmap_atomic (kaddr); +kunmap_local (kaddr); }brelse (header_bh);
@@ -560,7 +560,7 @@ static ssize_t nilfs_cpfile_do_get_cpinf } ncps =nilfs_cpfile_checkpoints_in_block (cpfile, cno, cur_cno); - kaddr =kmap_atomic (bh->b_page); + kaddr =kmap_local_page (bh->b_page); cp =nilfs_cpfile_block_get_checkpoint (cpfile, cno, bh, kaddr);for (i =0 ; i < ncps && n < nci; i++, cp = (void *)cp + cpsz) {if (!nilfs_checkpoint_invalid (cp)) {
@@ -570,7 +570,7 @@ static ssize_t nilfs_cpfile_do_get_cpinf n++; } } -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (bh); }
@@ -604,10 +604,10 @@ static ssize_t nilfs_cpfile_do_get_ssinf ret =nilfs_cpfile_get_header_block (cpfile, &bh);if (ret <0 ) goto out; - kaddr =kmap_atomic (bh->b_page); + kaddr =kmap_local_page (bh->b_page); header =nilfs_cpfile_block_get_header (cpfile, bh, kaddr); curr =le64_to_cpu (header->ch_snapshot_list.ssl_next); -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (bh);if (curr ==0 ) { ret =0 ;
@@ -625,7 +625,7 @@ static ssize_t nilfs_cpfile_do_get_ssinf ret =0 ;/* No snapshots (started from a hole block) */ goto out; } - kaddr =kmap_atomic (bh->b_page); + kaddr =kmap_local_page (bh->b_page);while (n < nci) { cp =nilfs_cpfile_block_get_checkpoint (cpfile, curr, bh, kaddr); curr = ~(__u64 )0 ;/* Terminator */
@@ -641,7 +641,7 @@ static ssize_t nilfs_cpfile_do_get_ssinf next_blkoff =nilfs_cpfile_get_blkoff (cpfile, next);if (curr_blkoff != next_blkoff) { -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (bh); ret =nilfs_cpfile_get_checkpoint_block (cpfile, next,0 , &bh);
@@ -649,12 +649,12 @@ static ssize_t nilfs_cpfile_do_get_ssinfWARN_ON (ret == -ENOENT ); goto out; } - kaddr =kmap_atomic (bh->b_page); + kaddr =kmap_local_page (bh->b_page); } curr = next; curr_blkoff = next_blkoff; } -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (bh); *cnop = curr; ret = n;
@@ -763,24 +763,24 @@ static int nilfs_cpfile_set_snapshot(str ret =nilfs_cpfile_get_checkpoint_block (cpfile, cno,0 , &cp_bh);if (ret <0 ) goto out_sem; - kaddr =kmap_atomic (cp_bh->b_page); + kaddr =kmap_local_page (cp_bh->b_page); cp =nilfs_cpfile_block_get_checkpoint (cpfile, cno, cp_bh, kaddr);if (nilfs_checkpoint_invalid (cp)) { ret = -ENOENT ; -kunmap_atomic (kaddr); +kunmap_local (kaddr); goto out_cp; }if (nilfs_checkpoint_snapshot (cp)) { ret =0 ; -kunmap_atomic (kaddr); +kunmap_local (kaddr); goto out_cp; } -kunmap_atomic (kaddr); +kunmap_local (kaddr); ret =nilfs_cpfile_get_header_block (cpfile, &header_bh);if (ret <0 ) goto out_cp; - kaddr =kmap_atomic (header_bh->b_page); + kaddr =kmap_local_page (header_bh->b_page); header =nilfs_cpfile_block_get_header (cpfile, header_bh, kaddr); list = &header->ch_snapshot_list; curr_bh = header_bh;
@@ -792,13 +792,13 @@ static int nilfs_cpfile_set_snapshot(str prev_blkoff =nilfs_cpfile_get_blkoff (cpfile, prev); curr = prev;if (curr_blkoff != prev_blkoff) { -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (curr_bh); ret =nilfs_cpfile_get_checkpoint_block (cpfile, curr,0 , &curr_bh);if (ret <0 ) goto out_header; - kaddr =kmap_atomic (curr_bh->b_page); + kaddr =kmap_local_page (curr_bh->b_page); } curr_blkoff = prev_blkoff; cp = nilfs_cpfile_block_get_checkpoint(
@@ -806,7 +806,7 @@ static int nilfs_cpfile_set_snapshot(str list = &cp->cp_snapshot_list; prev =le64_to_cpu (list->ssl_prev); } -kunmap_atomic (kaddr); +kunmap_local (kaddr);if (prev !=0 ) { ret = nilfs_cpfile_get_checkpoint_block(cpfile, prev, 0,
@@ -818,29 +818,29 @@ static int nilfs_cpfile_set_snapshot(strget_bh (prev_bh); } - kaddr =kmap_atomic (curr_bh->b_page); + kaddr =kmap_local_page (curr_bh->b_page); list =nilfs_cpfile_block_get_snapshot_list ( cpfile, curr, curr_bh, kaddr); list->ssl_prev =cpu_to_le64 (cno); -kunmap_atomic (kaddr); +kunmap_local (kaddr); - kaddr =kmap_atomic (cp_bh->b_page); + kaddr =kmap_local_page (cp_bh->b_page); cp =nilfs_cpfile_block_get_checkpoint (cpfile, cno, cp_bh, kaddr); cp->cp_snapshot_list.ssl_next =cpu_to_le64 (curr); cp->cp_snapshot_list.ssl_prev =cpu_to_le64 (prev);nilfs_checkpoint_set_snapshot (cp); -kunmap_atomic (kaddr); +kunmap_local (kaddr); - kaddr =kmap_atomic (prev_bh->b_page); + kaddr =kmap_local_page (prev_bh->b_page); list =nilfs_cpfile_block_get_snapshot_list ( cpfile, prev, prev_bh, kaddr); list->ssl_next =cpu_to_le64 (cno); -kunmap_atomic (kaddr); +kunmap_local (kaddr); - kaddr =kmap_atomic (header_bh->b_page); + kaddr =kmap_local_page (header_bh->b_page); header =nilfs_cpfile_block_get_header (cpfile, header_bh, kaddr);le64_add_cpu (&header->ch_nsnapshots,1 ); -kunmap_atomic (kaddr); +kunmap_local (kaddr);mark_buffer_dirty (prev_bh);mark_buffer_dirty (curr_bh);
@@ -881,23 +881,23 @@ static int nilfs_cpfile_clear_snapshot(s ret =nilfs_cpfile_get_checkpoint_block (cpfile, cno,0 , &cp_bh);if (ret <0 ) goto out_sem; - kaddr =kmap_atomic (cp_bh->b_page); + kaddr =kmap_local_page (cp_bh->b_page); cp =nilfs_cpfile_block_get_checkpoint (cpfile, cno, cp_bh, kaddr);if (nilfs_checkpoint_invalid (cp)) { ret = -ENOENT ; -kunmap_atomic (kaddr); +kunmap_local (kaddr); goto out_cp; }if (!nilfs_checkpoint_snapshot (cp)) { ret =0 ; -kunmap_atomic (kaddr); +kunmap_local (kaddr); goto out_cp; } list = &cp->cp_snapshot_list; next =le64_to_cpu (list->ssl_next); prev =le64_to_cpu (list->ssl_prev); -kunmap_atomic (kaddr); +kunmap_local (kaddr); ret =nilfs_cpfile_get_header_block (cpfile, &header_bh);if (ret <0 )
@@ -921,29 +921,29 @@ static int nilfs_cpfile_clear_snapshot(sget_bh (prev_bh); } - kaddr =kmap_atomic (next_bh->b_page); + kaddr =kmap_local_page (next_bh->b_page); list =nilfs_cpfile_block_get_snapshot_list ( cpfile, next, next_bh, kaddr); list->ssl_prev =cpu_to_le64 (prev); -kunmap_atomic (kaddr); +kunmap_local (kaddr); - kaddr =kmap_atomic (prev_bh->b_page); + kaddr =kmap_local_page (prev_bh->b_page); list =nilfs_cpfile_block_get_snapshot_list ( cpfile, prev, prev_bh, kaddr); list->ssl_next =cpu_to_le64 (next); -kunmap_atomic (kaddr); +kunmap_local (kaddr); - kaddr =kmap_atomic (cp_bh->b_page); + kaddr =kmap_local_page (cp_bh->b_page); cp =nilfs_cpfile_block_get_checkpoint (cpfile, cno, cp_bh, kaddr); cp->cp_snapshot_list.ssl_next =cpu_to_le64 (0 ); cp->cp_snapshot_list.ssl_prev =cpu_to_le64 (0 );nilfs_checkpoint_clear_snapshot (cp); -kunmap_atomic (kaddr); +kunmap_local (kaddr); - kaddr =kmap_atomic (header_bh->b_page); + kaddr =kmap_local_page (header_bh->b_page); header =nilfs_cpfile_block_get_header (cpfile, header_bh, kaddr);le64_add_cpu (&header->ch_nsnapshots,-1 ); -kunmap_atomic (kaddr); +kunmap_local (kaddr);mark_buffer_dirty (next_bh);mark_buffer_dirty (prev_bh);
@@ -1002,13 +1002,13 @@ int nilfs_cpfile_is_snapshot(struct inod ret =nilfs_cpfile_get_checkpoint_block (cpfile, cno,0 , &bh);if (ret <0 ) goto out; - kaddr =kmap_atomic (bh->b_page); + kaddr =kmap_local_page (bh->b_page); cp =nilfs_cpfile_block_get_checkpoint (cpfile, cno, bh, kaddr);if (nilfs_checkpoint_invalid (cp)) ret = -ENOENT ;else ret =nilfs_checkpoint_snapshot (cp); -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (bh); out:
@@ -1085,12 +1085,12 @@ int nilfs_cpfile_get_stat(struct inode * ret =nilfs_cpfile_get_header_block (cpfile, &bh);if (ret <0 ) goto out_sem; - kaddr =kmap_atomic (bh->b_page); + kaddr =kmap_local_page (bh->b_page); header =nilfs_cpfile_block_get_header (cpfile, bh, kaddr); cpstat->cs_cno =nilfs_mdt_cno (cpfile); cpstat->cs_ncps =le64_to_cpu (header->ch_ncheckpoints); cpstat->cs_nsss =le64_to_cpu (header->ch_nsnapshots); -kunmap_atomic (kaddr); +kunmap_local (kaddr);brelse (bh); out_sem:
_
Patches currently in -mm which might be from [email protected] are