Commit afcd4813 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-06-26-17-28' of... 

Merge tag 'mm-hotfixes-stable-2024-06-26-17-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "13 hotfixes, 7 are cc:stable.

  All are MM related apart from a MAINTAINERS update. There is no
  identifiable theme here - just singleton patches in various places"

* tag 'mm-hotfixes-stable-2024-06-26-17-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm/memory: don't require head page for do_set_pmd()
  mm/page_alloc: Separate THP PCP into movable and non-movable categories
  nfs: drop the incorrect assertion in nfs_swap_rw()
  mm/migrate: make migrate_pages_batch() stats consistent
  MAINTAINERS: TPM DEVICE DRIVER: update the W-tag
  selftests/mm:fix test_prctl_fork_exec return failure
  mm: convert page type macros to enum
  ocfs2: fix DIO failure due to insufficient transaction credits
  kasan: fix bad call to unpoison_slab_object
  mm: handle profiling for fake memory allocations during compaction
  mm/slab: fix 'variable obj_exts set but not used' warning
  /proc/pid/smaps: add mseal info for vma
  mm: fix incorrect vbq reference in purge_fragmented_block
parents 24ca36a5 ab1ffc86

Documentation/filesystems/proc.rst

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ encoded manner. The codes are the following: 
    um    userfaultfd missing tracking

    uw    userfaultfd wr-protect tracking

    ss    shadow stack page

    sl    sealed

    ==    =======================================



Note that there is no guarantee that every flag and associated mnemonic will

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -22745,7 +22745,7 @@ M: Jarkko Sakkinen <jarkko@kernel.org> 
R:	Jason Gunthorpe <jgg@ziepe.ca>

L:	linux-integrity@vger.kernel.org

S:	Maintained

W:	https://gitlab.com/jarkkojs/linux-tpmdd-test

W:	https://codeberg.org/jarkko/linux-tpmdd-test

Q:	https://patchwork.kernel.org/project/linux-integrity/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git

F:	Documentation/devicetree/bindings/tpm/

fs/nfs/direct.c

+0 −2
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ int nfs_swap_rw(struct kiocb *iocb, struct iov_iter *iter) 
{

	ssize_t ret;



	VM_BUG_ON(iov_iter_count(iter) != PAGE_SIZE);



	if (iov_iter_rw(iter) == READ)

		ret = nfs_file_direct_read(iocb, iter, true);

	else

fs/ocfs2/aops.c

+5 −0
Original line number Diff line number Diff line
@@ -2366,6 +2366,11 @@ static int ocfs2_dio_end_io_write(struct inode *inode, 
	}



	list_for_each_entry(ue, &dwc->dw_zero_list, ue_node) {

		ret = ocfs2_assure_trans_credits(handle, credits);

		if (ret < 0) {

			mlog_errno(ret);

			break;

		}

		ret = ocfs2_mark_extent_written(inode, &et, handle,

						ue->ue_cpos, 1,

						ue->ue_phys,

fs/ocfs2/journal.c

+17 −0
Original line number Diff line number Diff line
@@ -445,6 +445,23 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks) 
	return status;

}



/*

 * Make sure handle has at least 'nblocks' credits available. If it does not

 * have that many credits available, we will try to extend the handle to have

 * enough credits. If that fails, we will restart transaction to have enough

 * credits. Similar notes regarding data consistency and locking implications

 * as for ocfs2_extend_trans() apply here.

 */

int ocfs2_assure_trans_credits(handle_t *handle, int nblocks)

{

	int old_nblks = jbd2_handle_buffer_credits(handle);



	trace_ocfs2_assure_trans_credits(old_nblks);

	if (old_nblks >= nblocks)

		return 0;

	return ocfs2_extend_trans(handle, nblocks - old_nblks);

}



/*

 * If we have fewer than thresh credits, extend by OCFS2_MAX_TRANS_DATA.

 * If that fails, restart the transaction & regain write access for the