Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull xfs fixes from Darrick Wong:
 "A couple more patches to fix a locking bug and some inconsistent type
  usage in some of the new code:

   - Fix a forgotten rcu read unlock

   - Fix some inconsistent integer type usage"

* tag 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix type usage
  xfs: fix forgotten rcu read unlock when skipping inode reclaim
parents b04a2342 2015a63d

fs/xfs/libxfs/xfs_iext_tree.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ xfs_iext_rec_cmp( 
	xfs_fileoff_t		offset)

{

	uint64_t		rec_offset = rec->lo & XFS_IEXT_STARTOFF_MASK;

	u32			rec_len = rec->hi & XFS_IEXT_LENGTH_MASK;

	uint32_t		rec_len = rec->hi & XFS_IEXT_LENGTH_MASK;



	if (rec_offset > offset)

		return 1;

fs/xfs/libxfs/xfs_log_format.h

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ struct xfs_inode_log_format { 
	uint64_t		ilf_ino;	/* inode number */

	union {

		uint32_t	ilfu_rdev;	/* rdev value for dev inode*/

		u8		__pad[16];	/* unused */

		uint8_t		__pad[16];	/* unused */

	} ilf_u;

	int64_t			ilf_blkno;	/* blkno of inode buffer */

	int32_t			ilf_len;	/* len of inode buffer */
@@ -295,7 +295,7 @@ struct xfs_inode_log_format_32 { 
	uint64_t		ilf_ino;	/* inode number */

	union {

		uint32_t	ilfu_rdev;	/* rdev value for dev inode*/

		u8		__pad[16];	/* unused */

		uint8_t		__pad[16];	/* unused */

	} ilf_u;

	int64_t			ilf_blkno;	/* blkno of inode buffer */

	int32_t			ilf_len;	/* len of inode buffer */

fs/xfs/xfs_inode.c

+1 −0
Original line number Diff line number Diff line
@@ -2357,6 +2357,7 @@ xfs_ifree_cluster( 
				 */

				if (ip->i_ino != inum + i) {

					xfs_iunlock(ip, XFS_ILOCK_EXCL);

					rcu_read_unlock();

					continue;

				}

			}