diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 0b211cba1909..fa73179233ad 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -675,7 +675,7 @@ xfs_probe_cluster( | |||
675 | } else | 675 | } else |
676 | pg_offset = PAGE_CACHE_SIZE; | 676 | pg_offset = PAGE_CACHE_SIZE; |
677 | 677 | ||
678 | if (page->index == tindex && !TestSetPageLocked(page)) { | 678 | if (page->index == tindex && trylock_page(page)) { |
679 | pg_len = xfs_probe_page(page, pg_offset, mapped); | 679 | pg_len = xfs_probe_page(page, pg_offset, mapped); |
680 | unlock_page(page); | 680 | unlock_page(page); |
681 | } | 681 | } |
@@ -759,7 +759,7 @@ xfs_convert_page( | |||
759 | 759 | ||
760 | if (page->index != tindex) | 760 | if (page->index != tindex) |
761 | goto fail; | 761 | goto fail; |
762 | if (TestSetPageLocked(page)) | 762 | if (!trylock_page(page)) |
763 | goto fail; | 763 | goto fail; |
764 | if (PageWriteback(page)) | 764 | if (PageWriteback(page)) |
765 | goto fail_unlock_page; | 765 | goto fail_unlock_page; |