aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-08-07 11:19:43 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:06 -0400
commit2db04966ae9a3eeb57f28df9aac4e77d5b287cb1 (patch)
tree12f42fdef9b5965c7e9970f875a6bf33ed5090f1 /fs/btrfs/extent_io.c
parent5036f53868ae943704ae69a192d21225dc914c35 (diff)
Btrfs: Change TestSetPageLocked() to trylock_page()
Add backwards compatibility in compat.h Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> --- compat.h | 3 +++ extent_io.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r--fs/btrfs/extent_io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 1cf4baba4342..f46f88620c70 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -14,6 +14,7 @@
14#include <linux/pagevec.h> 14#include <linux/pagevec.h>
15#include "extent_io.h" 15#include "extent_io.h"
16#include "extent_map.h" 16#include "extent_map.h"
17#include "compat.h"
17 18
18/* temporary define until extent_map moves out of btrfs */ 19/* temporary define until extent_map moves out of btrfs */
19struct kmem_cache *btrfs_cache_create(const char *name, size_t size, 20struct kmem_cache *btrfs_cache_create(const char *name, size_t size,
@@ -3055,7 +3056,7 @@ int read_extent_buffer_pages(struct extent_io_tree *tree,
3055 for (i = start_i; i < num_pages; i++) { 3056 for (i = start_i; i < num_pages; i++) {
3056 page = extent_buffer_page(eb, i); 3057 page = extent_buffer_page(eb, i);
3057 if (!wait) { 3058 if (!wait) {
3058 if (TestSetPageLocked(page)) 3059 if (!trylock_page(page))
3059 goto unlock_exit; 3060 goto unlock_exit;
3060 } else { 3061 } else {
3061 lock_page(page); 3062 lock_page(page);