diff options
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r-- | fs/ocfs2/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 97a563bab9a8..36294446d960 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -630,10 +630,10 @@ static int ocfs2_remove_inode(struct inode *inode, | |||
630 | goto bail; | 630 | goto bail; |
631 | } | 631 | } |
632 | 632 | ||
633 | mutex_lock(&inode_alloc_inode->i_mutex); | 633 | inode_lock(inode_alloc_inode); |
634 | status = ocfs2_inode_lock(inode_alloc_inode, &inode_alloc_bh, 1); | 634 | status = ocfs2_inode_lock(inode_alloc_inode, &inode_alloc_bh, 1); |
635 | if (status < 0) { | 635 | if (status < 0) { |
636 | mutex_unlock(&inode_alloc_inode->i_mutex); | 636 | inode_unlock(inode_alloc_inode); |
637 | 637 | ||
638 | mlog_errno(status); | 638 | mlog_errno(status); |
639 | goto bail; | 639 | goto bail; |
@@ -680,7 +680,7 @@ bail_commit: | |||
680 | ocfs2_commit_trans(osb, handle); | 680 | ocfs2_commit_trans(osb, handle); |
681 | bail_unlock: | 681 | bail_unlock: |
682 | ocfs2_inode_unlock(inode_alloc_inode, 1); | 682 | ocfs2_inode_unlock(inode_alloc_inode, 1); |
683 | mutex_unlock(&inode_alloc_inode->i_mutex); | 683 | inode_unlock(inode_alloc_inode); |
684 | brelse(inode_alloc_bh); | 684 | brelse(inode_alloc_bh); |
685 | bail: | 685 | bail: |
686 | iput(inode_alloc_inode); | 686 | iput(inode_alloc_inode); |
@@ -751,10 +751,10 @@ static int ocfs2_wipe_inode(struct inode *inode, | |||
751 | /* Lock the orphan dir. The lock will be held for the entire | 751 | /* Lock the orphan dir. The lock will be held for the entire |
752 | * delete_inode operation. We do this now to avoid races with | 752 | * delete_inode operation. We do this now to avoid races with |
753 | * recovery completion on other nodes. */ | 753 | * recovery completion on other nodes. */ |
754 | mutex_lock(&orphan_dir_inode->i_mutex); | 754 | inode_lock(orphan_dir_inode); |
755 | status = ocfs2_inode_lock(orphan_dir_inode, &orphan_dir_bh, 1); | 755 | status = ocfs2_inode_lock(orphan_dir_inode, &orphan_dir_bh, 1); |
756 | if (status < 0) { | 756 | if (status < 0) { |
757 | mutex_unlock(&orphan_dir_inode->i_mutex); | 757 | inode_unlock(orphan_dir_inode); |
758 | 758 | ||
759 | mlog_errno(status); | 759 | mlog_errno(status); |
760 | goto bail; | 760 | goto bail; |
@@ -803,7 +803,7 @@ bail_unlock_dir: | |||
803 | return status; | 803 | return status; |
804 | 804 | ||
805 | ocfs2_inode_unlock(orphan_dir_inode, 1); | 805 | ocfs2_inode_unlock(orphan_dir_inode, 1); |
806 | mutex_unlock(&orphan_dir_inode->i_mutex); | 806 | inode_unlock(orphan_dir_inode); |
807 | brelse(orphan_dir_bh); | 807 | brelse(orphan_dir_bh); |
808 | bail: | 808 | bail: |
809 | iput(orphan_dir_inode); | 809 | iput(orphan_dir_inode); |