Commit 23aedc4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 updates from Ted Ts'o:
 "Only miscellaneous cleanups and bug fixes for ext4 this cycle"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: create ext4_kset dynamically
  ext4: create ext4_feat kobject dynamically
  ext4: release kobject/kset even when init/register fail
  ext4: fix incorrect indentation of if statement
  ext4: correct documentation for grpid mount option
  ext4: use 'sbi' instead of 'EXT4_SB(sb)'
  ext4: save error to disk in __ext4_grp_locked_error()
  jbd2: fix sphinx kernel-doc build warnings
  ext4: fix a race in the ext4 shutdown path
  mbcache: make sure c_entry_count is not decremented past zero
  ext4: no need flush workqueue before destroying it
  ext4: fixed alignment and minor code cleanup in ext4.h
  ext4: fix ENOSPC handling in DAX page fault handler
  dax: pass detailed error code from dax_iomap_fault()
  mbcache: revert "fs/mbcache.c: make count_objects() more robust"
  mbcache: initialize entry->e_referenced in mb_cache_entry_create()
  ext4: fix up remaining files with SPDX cleanups
parents 85b8bac9 5dc39711

Documentation/filesystems/ext4.txt

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ data_err=ignore(*) Just print an error message if an error occurs 
data_err=abort		Abort the journal if an error occurs in a file

			data buffer in ordered mode.



grpid			Give objects the same group ID as their creator.

grpid			New objects have the group ID of their parent.

bsdgroups



nogrpid		(*)	New objects have the group ID of their creator.

fs/dax.c

+6 −3
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ static bool dax_fault_is_synchronous(unsigned long flags, 
}



static int dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp,

			       const struct iomap_ops *ops)

			       int *iomap_errp, const struct iomap_ops *ops)

{

	struct vm_area_struct *vma = vmf->vma;

	struct address_space *mapping = vma->vm_file->f_mapping;
@@ -1148,6 +1148,8 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	 * that we never have to deal with more than a single extent here.

	 */

	error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap);

	if (iomap_errp)

		*iomap_errp = error;

	if (error) {

		vmf_ret = dax_fault_return(error);

		goto unlock_entry;
@@ -1481,6 +1483,7 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, 
 * @vmf: The description of the fault

 * @pe_size: Size of the page to fault in

 * @pfnp: PFN to insert for synchronous faults if fsync is required

 * @iomap_errp: Storage for detailed error code in case of error

 * @ops: Iomap ops passed from the file system

 *

 * When a page fault occurs, filesystems may call this helper in
@@ -1489,11 +1492,11 @@ static int dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, 
 * successfully.

 */

int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size,

		    pfn_t *pfnp, const struct iomap_ops *ops)

		    pfn_t *pfnp, int *iomap_errp, const struct iomap_ops *ops)

{

	switch (pe_size) {

	case PE_SIZE_PTE:

		return dax_iomap_pte_fault(vmf, pfnp, ops);

		return dax_iomap_pte_fault(vmf, pfnp, iomap_errp, ops);

	case PE_SIZE_PMD:

		return dax_iomap_pmd_fault(vmf, pfnp, ops);

	default:

fs/ext2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int ext2_dax_fault(struct vm_fault *vmf) 
	}

	down_read(&ei->dax_sem);



	ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, &ext2_iomap_ops);

	ret = dax_iomap_fault(vmf, PE_SIZE_PTE, NULL, NULL, &ext2_iomap_ops);



	up_read(&ei->dax_sem);

	if (vmf->flags & FAULT_FLAG_WRITE)

fs/ext4/acl.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// SPDX-License-Identifier: GPL-2.0

/*

  File: fs/ext4/acl.h

fs/ext4/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -355,10 +355,10 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb, 
	blk = ext4_inode_table(sb, desc);

	offset = blk - group_first_block;

	next_zero_bit = ext4_find_next_zero_bit(bh->b_data,

			EXT4_B2C(sbi, offset + EXT4_SB(sb)->s_itb_per_group),

			EXT4_B2C(sbi, offset + sbi->s_itb_per_group),

			EXT4_B2C(sbi, offset));

	if (next_zero_bit <

	    EXT4_B2C(sbi, offset + EXT4_SB(sb)->s_itb_per_group))

	    EXT4_B2C(sbi, offset + sbi->s_itb_per_group))

		/* bad bitmap for inode tables */

		return blk;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE