Commit b6b220b0 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -302,7 +302,7 @@ xfs_iext_rec_cmp( ...@@ -302,7 +302,7 @@ xfs_iext_rec_cmp(
xfs_fileoff_t offset) xfs_fileoff_t offset)
{ {
uint64_t rec_offset = rec->lo & XFS_IEXT_STARTOFF_MASK; 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) if (rec_offset > offset)
return 1; return 1;
......
...@@ -274,7 +274,7 @@ struct xfs_inode_log_format { ...@@ -274,7 +274,7 @@ struct xfs_inode_log_format {
uint64_t ilf_ino; /* inode number */ uint64_t ilf_ino; /* inode number */
union { union {
uint32_t ilfu_rdev; /* rdev value for dev inode*/ uint32_t ilfu_rdev; /* rdev value for dev inode*/
u8 __pad[16]; /* unused */ uint8_t __pad[16]; /* unused */
} ilf_u; } ilf_u;
int64_t ilf_blkno; /* blkno of inode buffer */ int64_t ilf_blkno; /* blkno of inode buffer */
int32_t ilf_len; /* len of inode buffer */ int32_t ilf_len; /* len of inode buffer */
...@@ -295,7 +295,7 @@ struct xfs_inode_log_format_32 { ...@@ -295,7 +295,7 @@ struct xfs_inode_log_format_32 {
uint64_t ilf_ino; /* inode number */ uint64_t ilf_ino; /* inode number */
union { union {
uint32_t ilfu_rdev; /* rdev value for dev inode*/ uint32_t ilfu_rdev; /* rdev value for dev inode*/
u8 __pad[16]; /* unused */ uint8_t __pad[16]; /* unused */
} ilf_u; } ilf_u;
int64_t ilf_blkno; /* blkno of inode buffer */ int64_t ilf_blkno; /* blkno of inode buffer */
int32_t ilf_len; /* len of inode buffer */ int32_t ilf_len; /* len of inode buffer */
......
...@@ -2357,6 +2357,7 @@ xfs_ifree_cluster( ...@@ -2357,6 +2357,7 @@ xfs_ifree_cluster(
*/ */
if (ip->i_ino != inum + i) { if (ip->i_ino != inum + i) {
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(ip, XFS_ILOCK_EXCL);
rcu_read_unlock();
continue; continue;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment