diff options
author | Chris Mason <chris.mason@oracle.com> | 2008-01-16 16:09:22 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:03:59 -0400 |
commit | 4d5e74bc0aec3f54b7e429d77b7c35de042c507d (patch) | |
tree | bba22e2a9cfbe5663a2489c5404fff72639b5277 /fs/btrfs/ordered-data.h | |
parent | 2da98f003f4788b0a72c5f87bc55b061f65f30fa (diff) |
Btrfs: Fix data=ordered vs wait_on_inode deadlock on older kernels
Using ilookup5 during data=ordered writeback could deadlock on I_LOCK. This
saves a pointer to the inode instead.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ordered-data.h')
-rw-r--r-- | fs/btrfs/ordered-data.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index 26b26212865b..f25c6771ec64 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -33,8 +33,10 @@ btrfs_ordered_inode_tree_init(struct btrfs_ordered_inode_tree *t) | |||
33 | 33 | ||
34 | int btrfs_add_ordered_inode(struct inode *inode); | 34 | int btrfs_add_ordered_inode(struct inode *inode); |
35 | int btrfs_find_del_first_ordered_inode(struct btrfs_ordered_inode_tree *tree, | 35 | int btrfs_find_del_first_ordered_inode(struct btrfs_ordered_inode_tree *tree, |
36 | u64 *root_objectid, u64 *objectid); | 36 | u64 *root_objectid, u64 *objectid, |
37 | struct inode **inode); | ||
37 | int btrfs_find_first_ordered_inode(struct btrfs_ordered_inode_tree *tree, | 38 | int btrfs_find_first_ordered_inode(struct btrfs_ordered_inode_tree *tree, |
38 | u64 *root_objectid, u64 *objectid); | 39 | u64 *root_objectid, u64 *objectid, |
40 | struct inode **inode); | ||
39 | int btrfs_del_ordered_inode(struct inode *inode); | 41 | int btrfs_del_ordered_inode(struct inode *inode); |
40 | #endif | 42 | #endif |