Skip to contentSkip to conversation

Btrfs: Fix btrfs_drop_extent_cache for skip pinned case

PATCH In review Yan, Zheng 1 participant 1 message Nov 12, 2009 Btrfs file system

lore
Share & tools
lore

Yan, Zheng

author
#0 lore raw

PATCH 11/12 Btrfs: Fix btrfs_drop_extent_cache for skip pinned case

The check for skip pinned case is wrong, it may breaks the while loop immaturely.

---
 fs/btrfs/file.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
fs/btrfs/file.c +3 -7
index a4a6d2c..a78fb9b 100644
@@ -179,18 +179,14 @@ int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end,
 		}
 		flags = em->flags;
 		if (skip_pinned && test_bit(EXTENT_FLAG_PINNED, &em->flags)) {
-			if (em->start <= start &&
-			    (!testend || em->start + em->len >= start + len)) {
+			if (testend && em->start + em->len >= start + len) {
 				free_extent_map(em);
 				write_unlock(&em_tree->lock);
 				break;
 			}
-			if (start < em->start) {
-				len = em->start - start;
-			} else {
+			start = em->start + em->len;
+			if (testend)
 				len = start + len - (em->start + em->len);
-				start = em->start + em->len;
-			}
 			free_extent_map(em);
 			write_unlock(&em_tree->lock);
 			continue;
Signature · 1 line
1.6.2.5