Commit 7b0acd91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-07-26-14-33' of... 

Merge tag 'mm-hotfixes-stable-2024-07-26-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc hotfixes from Andrew Morton:
 "11 hotfixes, 7 of which are cc:stable.  7 are MM, 4 are other"

* tag 'mm-hotfixes-stable-2024-07-26-14-33' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  nilfs2: handle inconsistent state in nilfs_btnode_create_block()
  selftests/mm: skip test for non-LPA2 and non-LVA systems
  mm/page_alloc: fix pcp->count race between drain_pages_zone() vs __rmqueue_pcplist()
  mm: memcg: add cacheline padding after lruvec in mem_cgroup_per_node
  alloc_tag: outline and export free_reserved_page()
  decompress_bunzip2: fix rare decompression failure
  mm/huge_memory: avoid PMD-size page cache if needed
  mm: huge_memory: use !CONFIG_64BIT to relax huge page alignment on 32 bit machines
  mm: fix old/young bit handling in the faulting path
  dt-bindings: arm: update James Clark's email address
  MAINTAINERS: mailmap: update James Clark's email address
parents 5256184b 4811f7af

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com> 
Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>

James Bottomley <jejb@mulgrave.(none)>

James Bottomley <jejb@titanic.il.steeleye.com>

James Clark <james.clark@linaro.org> <james.clark@arm.com>

James E Wilson <wilson@specifix.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Documentation/devicetree/bindings/arm/arm,coresight-dummy-sink.yaml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ description: | 
maintainers:

  - Mike Leach <mike.leach@linaro.org>

  - Suzuki K Poulose <suzuki.poulose@arm.com>

  - James Clark <james.clark@arm.com>

  - James Clark <james.clark@linaro.org>

  - Mao Jinlong <quic_jinlmao@quicinc.com>

  - Hao Zhang <quic_hazha@quicinc.com>

Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ description: | 
maintainers:

  - Mike Leach <mike.leach@linaro.org>

  - Suzuki K Poulose <suzuki.poulose@arm.com>

  - James Clark <james.clark@arm.com>

  - James Clark <james.clark@linaro.org>

  - Mao Jinlong <quic_jinlmao@quicinc.com>

  - Hao Zhang <quic_hazha@quicinc.com>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2196,7 +2196,7 @@ N: digicolor 
ARM/CORESIGHT FRAMEWORK AND DRIVERS

M:	Suzuki K Poulose <suzuki.poulose@arm.com>

R:	Mike Leach <mike.leach@linaro.org>

R:	James Clark <james.clark@arm.com>

R:	James Clark <james.clark@linaro.org>

L:	coresight@lists.linaro.org (moderated for non-subscribers)

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -17894,7 +17894,7 @@ F: tools/perf/ 
PERFORMANCE EVENTS TOOLING ARM64

R:	John Garry <john.g.garry@oracle.com>

R:	Will Deacon <will@kernel.org>

R:	James Clark <james.clark@arm.com>

R:	James Clark <james.clark@linaro.org>

R:	Mike Leach <mike.leach@linaro.org>

R:	Leo Yan <leo.yan@linux.dev>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

fs/nilfs2/btnode.c

+20 −5
Original line number Diff line number Diff line
@@ -51,12 +51,21 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 


	bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));

	if (unlikely(!bh))

		return NULL;

		return ERR_PTR(-ENOMEM);



	if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||

		     buffer_dirty(bh))) {

		brelse(bh);

		BUG();

		/*

		 * The block buffer at the specified new address was already

		 * in use.  This can happen if it is a virtual block number

		 * and has been reallocated due to corruption of the bitmap

		 * used to manage its allocation state (if not, the buffer

		 * clearing of an abandoned b-tree node is missing somewhere).

		 */

		nilfs_error(inode->i_sb,

			    "state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%lu)",

			    (unsigned long long)blocknr, inode->i_ino);

		goto failed;

	}

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

	bh->b_bdev = inode->i_sb->s_bdev;
@@ -67,6 +76,12 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 
	folio_unlock(bh->b_folio);

	folio_put(bh->b_folio);

	return bh;



failed:

	folio_unlock(bh->b_folio);

	folio_put(bh->b_folio);

	brelse(bh);

	return ERR_PTR(-EIO);

}



int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
@@ -217,8 +232,8 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, 
	}



	nbh = nilfs_btnode_create_block(btnc, newkey);

	if (!nbh)

		return -ENOMEM;

	if (IS_ERR(nbh))

		return PTR_ERR(nbh);



	BUG_ON(nbh == obh);

	ctxt->newbh = nbh;