Commit 69307ade authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:
 "Two small fixes that have come in during the past week:

   - Fix duplicated words in comments

   - Fix an ubsan complaint about null pointer arithmetic"

* tag 'xfs-5.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init
  xfs: delete duplicated words + other fixes
parents ff419b61 96cf2a2c

fs/xfs/libxfs/xfs_sb.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ xfs_sb_quota_to_disk( 
	 * disk. If neither are active, we should NULL the inode.

	 *

	 * In all cases, the separate pquotino must remain 0 because it

	 * it beyond the "end" of the valid non-pquotino superblock.

	 * is beyond the "end" of the valid non-pquotino superblock.

	 */

	if (from->sb_qflags & XFS_GQUOTA_ACCT)

		to->sb_gquotino = cpu_to_be64(from->sb_gquotino);

fs/xfs/xfs_attr_list.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ xfs_attr_shortform_compare(const void *a, const void *b) 
/*

 * Copy out entries of shortform attribute lists for attr_list().

 * Shortform attribute lists are not stored in hashval sorted order.

 * If the output buffer is not large enough to hold them all, then we

 * If the output buffer is not large enough to hold them all, then

 * we have to calculate each entries' hashvalue and sort them before

 * we can begin returning them to the user.

 */

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ xfs_buf_item_size_segment( 
 * stretch of non-contiguous chunks to be logged.  Contiguous chunks are logged

 * in a single iovec.

 *

 * Discontiguous buffers need a format structure per region that that is being

 * Discontiguous buffers need a format structure per region that is being

 * logged. This makes the changes in the buffer appear to log recovery as though

 * they came from separate buffers, just like would occur if multiple buffers

 * were used instead of a single discontiguous buffer. This enables

fs/xfs/xfs_buf_item_recover.c

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ xlog_recover_buf_commit_pass2( 
	 * or inode_cluster_size bytes, whichever is bigger.  The inode

	 * buffers in the log can be a different size if the log was generated

	 * by an older kernel using unclustered inode buffers or a newer kernel

	 * running with a different inode cluster size.  Regardless, if the

	 * running with a different inode cluster size.  Regardless, if

	 * the inode buffer size isn't max(blocksize, inode_cluster_size)

	 * for *our* value of inode_cluster_size, then we need to keep

	 * the buffer out of the buffer cache so that the buffer won't

fs/xfs/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ xfs_qm_dqget_checks( 
}



/*

 * Given the file system, id, and type (UDQUOT/GDQUOT), return a a locked

 * Given the file system, id, and type (UDQUOT/GDQUOT), return a locked

 * dquot, doing an allocation (if requested) as needed.

 */

int

CRA Git | Maintained and supported by SUSTech CRA and CCSE