diff options
Diffstat (limited to 'fs/xfs/xfs_inode_item.c')
-rw-r--r-- | fs/xfs/xfs_inode_item.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 93b5db453ea2..167b33f15772 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c | |||
@@ -547,7 +547,7 @@ STATIC void | |||
547 | xfs_inode_item_pin( | 547 | xfs_inode_item_pin( |
548 | xfs_inode_log_item_t *iip) | 548 | xfs_inode_log_item_t *iip) |
549 | { | 549 | { |
550 | ASSERT(ismrlocked(&(iip->ili_inode->i_lock), MR_UPDATE)); | 550 | ASSERT(xfs_isilocked(iip->ili_inode, XFS_ILOCK_EXCL)); |
551 | xfs_ipin(iip->ili_inode); | 551 | xfs_ipin(iip->ili_inode); |
552 | } | 552 | } |
553 | 553 | ||
@@ -664,13 +664,13 @@ xfs_inode_item_unlock( | |||
664 | 664 | ||
665 | ASSERT(iip != NULL); | 665 | ASSERT(iip != NULL); |
666 | ASSERT(iip->ili_inode->i_itemp != NULL); | 666 | ASSERT(iip->ili_inode->i_itemp != NULL); |
667 | ASSERT(ismrlocked(&(iip->ili_inode->i_lock), MR_UPDATE)); | 667 | ASSERT(xfs_isilocked(iip->ili_inode, XFS_ILOCK_EXCL)); |
668 | ASSERT((!(iip->ili_inode->i_itemp->ili_flags & | 668 | ASSERT((!(iip->ili_inode->i_itemp->ili_flags & |
669 | XFS_ILI_IOLOCKED_EXCL)) || | 669 | XFS_ILI_IOLOCKED_EXCL)) || |
670 | ismrlocked(&(iip->ili_inode->i_iolock), MR_UPDATE)); | 670 | xfs_isilocked(iip->ili_inode, XFS_IOLOCK_EXCL)); |
671 | ASSERT((!(iip->ili_inode->i_itemp->ili_flags & | 671 | ASSERT((!(iip->ili_inode->i_itemp->ili_flags & |
672 | XFS_ILI_IOLOCKED_SHARED)) || | 672 | XFS_ILI_IOLOCKED_SHARED)) || |
673 | ismrlocked(&(iip->ili_inode->i_iolock), MR_ACCESS)); | 673 | xfs_isilocked(iip->ili_inode, XFS_IOLOCK_SHARED)); |
674 | /* | 674 | /* |
675 | * Clear the transaction pointer in the inode. | 675 | * Clear the transaction pointer in the inode. |
676 | */ | 676 | */ |
@@ -769,7 +769,7 @@ xfs_inode_item_pushbuf( | |||
769 | 769 | ||
770 | ip = iip->ili_inode; | 770 | ip = iip->ili_inode; |
771 | 771 | ||
772 | ASSERT(ismrlocked(&(ip->i_lock), MR_ACCESS)); | 772 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED)); |
773 | 773 | ||
774 | /* | 774 | /* |
775 | * The ili_pushbuf_flag keeps others from | 775 | * The ili_pushbuf_flag keeps others from |
@@ -857,7 +857,7 @@ xfs_inode_item_push( | |||
857 | 857 | ||
858 | ip = iip->ili_inode; | 858 | ip = iip->ili_inode; |
859 | 859 | ||
860 | ASSERT(ismrlocked(&(ip->i_lock), MR_ACCESS)); | 860 | ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED)); |
861 | ASSERT(issemalocked(&(ip->i_flock))); | 861 | ASSERT(issemalocked(&(ip->i_flock))); |
862 | /* | 862 | /* |
863 | * Since we were able to lock the inode's flush lock and | 863 | * Since we were able to lock the inode's flush lock and |