[v13,26/42] btrfs: save irq flags when looking up an ordered extent

Commit Message

Naohiro Aota Jan. 22, 2021, 6:21 a.m. UTC

From: Johannes Thumshirn <[e-mail]>

A following patch will add another caller of
btrfs_lookup_ordered_extent() from a bio endio context.

btrfs_lookup_ordered_extent() uses spin_lock_irq() which unconditionally
disables interrupts. Change this to spin_lock_irqsave() so interrupts
aren't disabled and re-enabled unconditionally.

Signed-off-by: Johannes Thumshirn <[e-mail]>
---
 fs/btrfs/ordered-data.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Josef Bacik Jan. 22, 2021, 3:24 p.m. UTC | #1

On 1/22/21 1:21 AM, Naohiro Aota wrote:
> From: Johannes Thumshirn <[e-mail]>
> 
> A following patch will add another caller of
> btrfs_lookup_ordered_extent() from a bio endio context.
> 
> btrfs_lookup_ordered_extent() uses spin_lock_irq() which unconditionally
> disables interrupts. Change this to spin_lock_irqsave() so interrupts
> aren't disabled and re-enabled unconditionally.
> 
> Signed-off-by: Johannes Thumshirn <[e-mail]>

Reviewed-by: Josef Bacik <[e-mail]>

Thanks,

Josef

Patch

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 4dd935d602b8..538378fe0853 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -757,9 +757,10 @@  struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *ino
 	struct btrfs_ordered_inode_tree *tree;
 	struct rb_node *node;
 	struct btrfs_ordered_extent *entry = NULL;
+	unsigned long flags;
 
 	tree = &inode->ordered_tree;
-	spin_lock_irq(&tree->lock);
+	spin_lock_irqsave(&tree->lock, flags);
 	node = tree_search(tree, file_offset);
 	if (!node)
 		goto out;
@@ -770,7 +771,7 @@  struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *ino
 	if (entry)
 		refcount_inc(&entry->refs);
 out:
-	spin_unlock_irq(&tree->lock);
+	spin_unlock_irqrestore(&tree->lock, flags);
 	return entry;
 }