mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 08:16:47 +07:00
Changes since last update:
- Fix a forgotten rcu read unlock - Fix some inconsistent integer type usage. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJaDplqAAoJEPh/dxk0SrTrgwoP/R47TYDyR9HH2X8WRCamgZKu zVoPTCv8+OP7DwsrkZdhMfn3+GtDUKihr0DhU2sP54ifdH/iJ+JdyX1J77B8+hyE 70fONGDn1XR+AeThaBDLw2t+FvabHICYF3gUVduj6xGszSJqjPWkaTOTmpG1rrs0 q3SeHDddX6gUkral6wDHWdYRqvgthW++oqmUMzQuK991+XtbJwVzVCpppXi7s6ip VDhHfu0mbux9hzJGESToOOXuvb1vBe4wTqD3HVKKbCofiLbrX1dDtu9IaTCQa6vn kzuk2Z4DkPQe6IYUBq7/Z/cSpSk+ECHV+QwCeX+eA1D3nbt/dIbdThHM/FB3Qcai NaQ0+vxWFIIEgAPs03NiZ87h+tFtj2Fu6c5te7PceF9UsTe3G8WQDp8q90Lzy14j EIJ83wMJrAdoruXcCTzuuDotrXjW1Ss3KyYzmINrOGlLp86uKAG500Eete+ik9fm F+vfFbs+X5ZcGcqeAJo6v9FL9nV7K0IBZ9b1S3iNx319sK35Nmt0OYZ4ae8ftxKV DoaU1QifSakgsowHVlTwajJnl6l+NK5lFNjL0fKjZsnZ+zLuF8bL/dNeMWozBrE3 welZya13dl+ZBC6xutJkkdBBvqKVhcliLS+LGfp2bdZTKoVx4P08TbtERCkDAzeF ZS74pC9u90HshYjXwNl/ =P/lR -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
b6b220b0c7
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -2357,6 +2357,7 @@ xfs_ifree_cluster(
|
||||
*/
|
||||
if (ip->i_ino != inum + i) {
|
||||
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
||||
rcu_read_unlock();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user