diff options
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
-rw-r--r-- | fs/ocfs2/dlmglue.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 1c29b96b99e7..7a22118ef046 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
@@ -1579,7 +1579,6 @@ static int ocfs2_assign_bh(struct inode *inode, | |||
1579 | * the result of the lock will be communicated via the callback. | 1579 | * the result of the lock will be communicated via the callback. |
1580 | */ | 1580 | */ |
1581 | int ocfs2_meta_lock_full(struct inode *inode, | 1581 | int ocfs2_meta_lock_full(struct inode *inode, |
1582 | struct ocfs2_journal_handle *handle, | ||
1583 | struct buffer_head **ret_bh, | 1582 | struct buffer_head **ret_bh, |
1584 | int ex, | 1583 | int ex, |
1585 | int arg_flags) | 1584 | int arg_flags) |
@@ -1707,18 +1706,16 @@ bail: | |||
1707 | * the lock inversion simply. | 1706 | * the lock inversion simply. |
1708 | */ | 1707 | */ |
1709 | int ocfs2_meta_lock_with_page(struct inode *inode, | 1708 | int ocfs2_meta_lock_with_page(struct inode *inode, |
1710 | struct ocfs2_journal_handle *handle, | ||
1711 | struct buffer_head **ret_bh, | 1709 | struct buffer_head **ret_bh, |
1712 | int ex, | 1710 | int ex, |
1713 | struct page *page) | 1711 | struct page *page) |
1714 | { | 1712 | { |
1715 | int ret; | 1713 | int ret; |
1716 | 1714 | ||
1717 | ret = ocfs2_meta_lock_full(inode, handle, ret_bh, ex, | 1715 | ret = ocfs2_meta_lock_full(inode, ret_bh, ex, OCFS2_LOCK_NONBLOCK); |
1718 | OCFS2_LOCK_NONBLOCK); | ||
1719 | if (ret == -EAGAIN) { | 1716 | if (ret == -EAGAIN) { |
1720 | unlock_page(page); | 1717 | unlock_page(page); |
1721 | if (ocfs2_meta_lock(inode, handle, ret_bh, ex) == 0) | 1718 | if (ocfs2_meta_lock(inode, ret_bh, ex) == 0) |
1722 | ocfs2_meta_unlock(inode, ex); | 1719 | ocfs2_meta_unlock(inode, ex); |
1723 | ret = AOP_TRUNCATED_PAGE; | 1720 | ret = AOP_TRUNCATED_PAGE; |
1724 | } | 1721 | } |