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/ioctl.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/ioctl.c')
-rw-r--r-- | fs/ocfs2/ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/ioctl.c b/fs/ocfs2/ioctl.c index 87dcece7e1b5..67c2fb4bae91 100644 --- a/fs/ocfs2/ioctl.c +++ b/fs/ocfs2/ioctl.c | |||
@@ -27,14 +27,14 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags) | |||
27 | { | 27 | { |
28 | int status; | 28 | int status; |
29 | 29 | ||
30 | status = ocfs2_meta_lock(inode, NULL, 0); | 30 | status = ocfs2_inode_lock(inode, NULL, 0); |
31 | if (status < 0) { | 31 | if (status < 0) { |
32 | mlog_errno(status); | 32 | mlog_errno(status); |
33 | return status; | 33 | return status; |
34 | } | 34 | } |
35 | ocfs2_get_inode_flags(OCFS2_I(inode)); | 35 | ocfs2_get_inode_flags(OCFS2_I(inode)); |
36 | *flags = OCFS2_I(inode)->ip_attr; | 36 | *flags = OCFS2_I(inode)->ip_attr; |
37 | ocfs2_meta_unlock(inode, 0); | 37 | ocfs2_inode_unlock(inode, 0); |
38 | 38 | ||
39 | mlog_exit(status); | 39 | mlog_exit(status); |
40 | return status; | 40 | return status; |
@@ -52,7 +52,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, | |||
52 | 52 | ||
53 | mutex_lock(&inode->i_mutex); | 53 | mutex_lock(&inode->i_mutex); |
54 | 54 | ||
55 | status = ocfs2_meta_lock(inode, &bh, 1); | 55 | status = ocfs2_inode_lock(inode, &bh, 1); |
56 | if (status < 0) { | 56 | if (status < 0) { |
57 | mlog_errno(status); | 57 | mlog_errno(status); |
58 | goto bail; | 58 | goto bail; |
@@ -100,7 +100,7 @@ static int ocfs2_set_inode_attr(struct inode *inode, unsigned flags, | |||
100 | 100 | ||
101 | ocfs2_commit_trans(osb, handle); | 101 | ocfs2_commit_trans(osb, handle); |
102 | bail_unlock: | 102 | bail_unlock: |
103 | ocfs2_meta_unlock(inode, 1); | 103 | ocfs2_inode_unlock(inode, 1); |
104 | bail: | 104 | bail: |
105 | mutex_unlock(&inode->i_mutex); | 105 | mutex_unlock(&inode->i_mutex); |
106 | 106 | ||