diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2007-10-18 18:30:42 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2008-01-25 17:46:01 -0500 |
commit | e63aecb651ba73dffc62f9608ee1b7ae2a0ffd4b (patch) | |
tree | 06a4b727230120fe73421dc3149c21aaed5fe91e /fs/ocfs2/alloc.c | |
parent | c934a92d05b549dd2f25db72c5fc3cb9dcf1b611 (diff) |
ocfs2: Rename ocfs2_meta_[un]lock
Call this the "inode_lock" now, since it covers both data and meta data.
This patch makes no functional changes.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/alloc.c')
-rw-r--r-- | fs/ocfs2/alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 23c8cda43f19..e6df06ac6405 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
@@ -4731,7 +4731,7 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) | |||
4731 | 4731 | ||
4732 | mutex_lock(&data_alloc_inode->i_mutex); | 4732 | mutex_lock(&data_alloc_inode->i_mutex); |
4733 | 4733 | ||
4734 | status = ocfs2_meta_lock(data_alloc_inode, &data_alloc_bh, 1); | 4734 | status = ocfs2_inode_lock(data_alloc_inode, &data_alloc_bh, 1); |
4735 | if (status < 0) { | 4735 | if (status < 0) { |
4736 | mlog_errno(status); | 4736 | mlog_errno(status); |
4737 | goto out_mutex; | 4737 | goto out_mutex; |
@@ -4753,7 +4753,7 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) | |||
4753 | 4753 | ||
4754 | out_unlock: | 4754 | out_unlock: |
4755 | brelse(data_alloc_bh); | 4755 | brelse(data_alloc_bh); |
4756 | ocfs2_meta_unlock(data_alloc_inode, 1); | 4756 | ocfs2_inode_unlock(data_alloc_inode, 1); |
4757 | 4757 | ||
4758 | out_mutex: | 4758 | out_mutex: |
4759 | mutex_unlock(&data_alloc_inode->i_mutex); | 4759 | mutex_unlock(&data_alloc_inode->i_mutex); |
@@ -5077,7 +5077,7 @@ static int ocfs2_free_cached_items(struct ocfs2_super *osb, | |||
5077 | 5077 | ||
5078 | mutex_lock(&inode->i_mutex); | 5078 | mutex_lock(&inode->i_mutex); |
5079 | 5079 | ||
5080 | ret = ocfs2_meta_lock(inode, &di_bh, 1); | 5080 | ret = ocfs2_inode_lock(inode, &di_bh, 1); |
5081 | if (ret) { | 5081 | if (ret) { |
5082 | mlog_errno(ret); | 5082 | mlog_errno(ret); |
5083 | goto out_mutex; | 5083 | goto out_mutex; |
@@ -5118,7 +5118,7 @@ out_journal: | |||
5118 | ocfs2_commit_trans(osb, handle); | 5118 | ocfs2_commit_trans(osb, handle); |
5119 | 5119 | ||
5120 | out_unlock: | 5120 | out_unlock: |
5121 | ocfs2_meta_unlock(inode, 1); | 5121 | ocfs2_inode_unlock(inode, 1); |
5122 | brelse(di_bh); | 5122 | brelse(di_bh); |
5123 | out_mutex: | 5123 | out_mutex: |
5124 | mutex_unlock(&inode->i_mutex); | 5124 | mutex_unlock(&inode->i_mutex); |