[053/111] Btrfs: Fix btrfs_drop_extent_cache for skip pinned case
in [Kernel]
|
Prev: [055/111] Btrfs: dont add extent 0 to the free space cache v2
Next: [074/111] Btrfs: fix race between allocate and release extent buffer.
From: Greg KH on 11 Aug 2010 20:40 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Yan, Zheng <zheng.yan(a)oracle.com> commit 55ef68990029fcd8d04d42fc184aa7fb18cf309e upstream. The check for skip pinned case is wrong, it may breaks the while loop too soon. Signed-off-by: Yan Zheng <zheng.yan(a)oracle.com> Signed-off-by: Chris Mason <chris.mason(a)oracle.com> Acked-by: Jeff Mahoney <jeffm(a)suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- fs/btrfs/file.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -179,18 +179,14 @@ int btrfs_drop_extent_cache(struct inode } 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |