diff options
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
-rw-r--r-- | fs/ocfs2/dlmglue.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 1a80fa9e7c9a..15a5167e0513 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
@@ -1950,8 +1950,7 @@ int ocfs2_inode_lock_full(struct inode *inode, | |||
1950 | goto local; | 1950 | goto local; |
1951 | 1951 | ||
1952 | if (!(arg_flags & OCFS2_META_LOCK_RECOVERY)) | 1952 | if (!(arg_flags & OCFS2_META_LOCK_RECOVERY)) |
1953 | wait_event(osb->recovery_event, | 1953 | ocfs2_wait_for_recovery(osb); |
1954 | ocfs2_node_map_is_empty(osb, &osb->recovery_map)); | ||
1955 | 1954 | ||
1956 | lockres = &OCFS2_I(inode)->ip_inode_lockres; | 1955 | lockres = &OCFS2_I(inode)->ip_inode_lockres; |
1957 | level = ex ? LKM_EXMODE : LKM_PRMODE; | 1956 | level = ex ? LKM_EXMODE : LKM_PRMODE; |
@@ -1974,8 +1973,7 @@ int ocfs2_inode_lock_full(struct inode *inode, | |||
1974 | * committed to owning this lock so we don't allow signals to | 1973 | * committed to owning this lock so we don't allow signals to |
1975 | * abort the operation. */ | 1974 | * abort the operation. */ |
1976 | if (!(arg_flags & OCFS2_META_LOCK_RECOVERY)) | 1975 | if (!(arg_flags & OCFS2_META_LOCK_RECOVERY)) |
1977 | wait_event(osb->recovery_event, | 1976 | ocfs2_wait_for_recovery(osb); |
1978 | ocfs2_node_map_is_empty(osb, &osb->recovery_map)); | ||
1979 | 1977 | ||
1980 | local: | 1978 | local: |
1981 | /* | 1979 | /* |