Commit 4b49c0ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-11-12-16-39' of... 

Merge tag 'mm-hotfixes-stable-2024-11-12-16-39' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "10 hotfixes, 7 of which are cc:stable. 7 are MM, 3 are not. All
  singletons"

* tag 'mm-hotfixes-stable-2024-11-12-16-39' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: swapfile: fix cluster reclaim work crash on rotational devices
  selftests: hugetlb_dio: fixup check for initial conditions to skip in the start
  mm/thp: fix deferred split queue not partially_mapped: fix
  mm/gup: avoid an unnecessary allocation call for FOLL_LONGTERM cases
  nommu: pass NULL argument to vma_iter_prealloc()
  ocfs2: fix UBSAN warning in ocfs2_verify_volume()
  nilfs2: fix null-ptr-deref in block_dirty_buffer tracepoint
  nilfs2: fix null-ptr-deref in block_touch_buffer tracepoint
  mm: page_alloc: move mlocked flag clearance into free_pages_prepare()
  mm: count zeromap read and set for swapout and swapin
parents f1b785f4 dcf32ea7

Documentation/admin-guide/cgroup-v2.rst

+9 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,15 @@ The following nested keys are defined. 
	  pglazyfreed (npn)

		Amount of reclaimed lazyfree pages



	  swpin_zero

		Number of pages swapped into memory and filled with zero, where I/O

		was optimized out because the page content was detected to be zero

		during swapout.



	  swpout_zero

		Number of zero-filled pages swapped out with I/O skipped due to the

		content being detected as zero.



	  zswpin

		Number of pages moved in to memory from zswap.

fs/nilfs2/btnode.c

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 
		goto failed;

	}

	memset(bh->b_data, 0, i_blocksize(inode));

	bh->b_bdev = inode->i_sb->s_bdev;

	bh->b_blocknr = blocknr;

	set_buffer_mapped(bh);

	set_buffer_uptodate(bh);
@@ -133,7 +132,6 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
		goto found;

	}

	set_buffer_mapped(bh);

	bh->b_bdev = inode->i_sb->s_bdev;

	bh->b_blocknr = pblocknr; /* set block address for read */

	bh->b_end_io = end_buffer_read_sync;

	get_bh(bh);

fs/nilfs2/gcinode.c

+1 −3
Original line number Diff line number Diff line
@@ -83,10 +83,8 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, 
		goto out;

	}



	if (!buffer_mapped(bh)) {

		bh->b_bdev = inode->i_sb->s_bdev;

	if (!buffer_mapped(bh))

		set_buffer_mapped(bh);

	}

	bh->b_blocknr = pbn;

	bh->b_end_io = end_buffer_read_sync;

	get_bh(bh);

fs/nilfs2/mdt.c

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static int nilfs_mdt_create_block(struct inode *inode, unsigned long block, 
	if (buffer_uptodate(bh))

		goto failed_bh;



	bh->b_bdev = sb->s_bdev;

	err = nilfs_mdt_insert_new_block(inode, block, bh, init_block);

	if (likely(!err)) {

		get_bh(bh);

fs/nilfs2/page.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static struct buffer_head *__nilfs_get_folio_block(struct folio *folio, 
	first_block = (unsigned long)index << (PAGE_SHIFT - blkbits);

	bh = get_nth_bh(bh, block - first_block);



	touch_buffer(bh);

	wait_on_buffer(bh);

	return bh;

}
@@ -64,6 +63,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode, 
		folio_put(folio);

		return NULL;

	}

	bh->b_bdev = inode->i_sb->s_bdev;

	return bh;

}