diff options
Diffstat (limited to 'fs/ocfs2/dlmglue.h')
-rw-r--r-- | fs/ocfs2/dlmglue.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/dlmglue.h b/fs/ocfs2/dlmglue.h index 3fd7729daeef..6dcbc944e8ce 100644 --- a/fs/ocfs2/dlmglue.h +++ b/fs/ocfs2/dlmglue.h | |||
@@ -49,7 +49,7 @@ struct ocfs2_meta_lvb { | |||
49 | __be32 lvb_reserved2; | 49 | __be32 lvb_reserved2; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | /* ocfs2_meta_lock_full() 'arg_flags' flags */ | 52 | /* ocfs2_inode_lock_full() 'arg_flags' flags */ |
53 | /* don't wait on recovery. */ | 53 | /* don't wait on recovery. */ |
54 | #define OCFS2_META_LOCK_RECOVERY (0x01) | 54 | #define OCFS2_META_LOCK_RECOVERY (0x01) |
55 | /* Instruct the dlm not to queue ourselves on the other node. */ | 55 | /* Instruct the dlm not to queue ourselves on the other node. */ |
@@ -74,21 +74,21 @@ void ocfs2_rw_unlock(struct inode *inode, int write); | |||
74 | int ocfs2_open_lock(struct inode *inode); | 74 | int ocfs2_open_lock(struct inode *inode); |
75 | int ocfs2_try_open_lock(struct inode *inode, int write); | 75 | int ocfs2_try_open_lock(struct inode *inode, int write); |
76 | void ocfs2_open_unlock(struct inode *inode); | 76 | void ocfs2_open_unlock(struct inode *inode); |
77 | int ocfs2_meta_lock_atime(struct inode *inode, | 77 | int ocfs2_inode_lock_atime(struct inode *inode, |
78 | struct vfsmount *vfsmnt, | 78 | struct vfsmount *vfsmnt, |
79 | int *level); | 79 | int *level); |
80 | int ocfs2_meta_lock_full(struct inode *inode, | 80 | int ocfs2_inode_lock_full(struct inode *inode, |
81 | struct buffer_head **ret_bh, | 81 | struct buffer_head **ret_bh, |
82 | int ex, | 82 | int ex, |
83 | int arg_flags); | 83 | int arg_flags); |
84 | int ocfs2_meta_lock_with_page(struct inode *inode, | 84 | int ocfs2_inode_lock_with_page(struct inode *inode, |
85 | struct buffer_head **ret_bh, | 85 | struct buffer_head **ret_bh, |
86 | int ex, | 86 | int ex, |
87 | struct page *page); | 87 | struct page *page); |
88 | /* 99% of the time we don't want to supply any additional flags -- | 88 | /* 99% of the time we don't want to supply any additional flags -- |
89 | * those are for very specific cases only. */ | 89 | * those are for very specific cases only. */ |
90 | #define ocfs2_meta_lock(i, b, e) ocfs2_meta_lock_full(i, b, e, 0) | 90 | #define ocfs2_inode_lock(i, b, e) ocfs2_inode_lock_full(i, b, e, 0) |
91 | void ocfs2_meta_unlock(struct inode *inode, | 91 | void ocfs2_inode_unlock(struct inode *inode, |
92 | int ex); | 92 | int ex); |
93 | int ocfs2_super_lock(struct ocfs2_super *osb, | 93 | int ocfs2_super_lock(struct ocfs2_super *osb, |
94 | int ex); | 94 | int ex); |