diff options
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r-- | fs/ocfs2/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 20e60e4b1f10..dec0ece6267a 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -441,7 +441,7 @@ static int ocfs2_read_locked_inode(struct inode *inode, | |||
441 | generation, inode); | 441 | generation, inode); |
442 | 442 | ||
443 | if (can_lock) { | 443 | if (can_lock) { |
444 | status = ocfs2_meta_lock(inode, NULL, NULL, 0); | 444 | status = ocfs2_meta_lock(inode, NULL, 0); |
445 | if (status) { | 445 | if (status) { |
446 | make_bad_inode(inode); | 446 | make_bad_inode(inode); |
447 | mlog_errno(status); | 447 | mlog_errno(status); |
@@ -582,7 +582,7 @@ static int ocfs2_remove_inode(struct inode *inode, | |||
582 | } | 582 | } |
583 | 583 | ||
584 | mutex_lock(&inode_alloc_inode->i_mutex); | 584 | mutex_lock(&inode_alloc_inode->i_mutex); |
585 | status = ocfs2_meta_lock(inode_alloc_inode, NULL, &inode_alloc_bh, 1); | 585 | status = ocfs2_meta_lock(inode_alloc_inode, &inode_alloc_bh, 1); |
586 | if (status < 0) { | 586 | if (status < 0) { |
587 | mutex_unlock(&inode_alloc_inode->i_mutex); | 587 | mutex_unlock(&inode_alloc_inode->i_mutex); |
588 | 588 | ||
@@ -705,7 +705,7 @@ static int ocfs2_wipe_inode(struct inode *inode, | |||
705 | * delete_inode operation. We do this now to avoid races with | 705 | * delete_inode operation. We do this now to avoid races with |
706 | * recovery completion on other nodes. */ | 706 | * recovery completion on other nodes. */ |
707 | mutex_lock(&orphan_dir_inode->i_mutex); | 707 | mutex_lock(&orphan_dir_inode->i_mutex); |
708 | status = ocfs2_meta_lock(orphan_dir_inode, NULL, &orphan_dir_bh, 1); | 708 | status = ocfs2_meta_lock(orphan_dir_inode, &orphan_dir_bh, 1); |
709 | if (status < 0) { | 709 | if (status < 0) { |
710 | mutex_unlock(&orphan_dir_inode->i_mutex); | 710 | mutex_unlock(&orphan_dir_inode->i_mutex); |
711 | 711 | ||
@@ -933,7 +933,7 @@ void ocfs2_delete_inode(struct inode *inode) | |||
933 | * allocation lock here as it won't be needed - nobody will | 933 | * allocation lock here as it won't be needed - nobody will |
934 | * have the file open. | 934 | * have the file open. |
935 | */ | 935 | */ |
936 | status = ocfs2_meta_lock(inode, NULL, &di_bh, 1); | 936 | status = ocfs2_meta_lock(inode, &di_bh, 1); |
937 | if (status < 0) { | 937 | if (status < 0) { |
938 | if (status != -ENOENT) | 938 | if (status != -ENOENT) |
939 | mlog_errno(status); | 939 | mlog_errno(status); |
@@ -1180,7 +1180,7 @@ int ocfs2_inode_revalidate(struct dentry *dentry) | |||
1180 | 1180 | ||
1181 | /* Let ocfs2_meta_lock do the work of updating our struct | 1181 | /* Let ocfs2_meta_lock do the work of updating our struct |
1182 | * inode for us. */ | 1182 | * inode for us. */ |
1183 | status = ocfs2_meta_lock(inode, NULL, NULL, 0); | 1183 | status = ocfs2_meta_lock(inode, NULL, 0); |
1184 | if (status < 0) { | 1184 | if (status < 0) { |
1185 | if (status != -ENOENT) | 1185 | if (status != -ENOENT) |
1186 | mlog_errno(status); | 1186 | mlog_errno(status); |