From 3432031fe9508ac110b7f9b0c3a6e4cc31cf50f5 Mon Sep 17 00:00:00 2001 From: Yan Zheng Date: Tue, 11 Nov 2008 09:33:29 -0500 Subject: [PATCH] --- yaml --- r: 129013 b: refs/heads/master c: 8247b41ac980d125de8aeba6f33f381056ac0ecb h: refs/heads/master i: 129011: 4c71f98704857f91b42f354034e9fc7fd3b14c6e v: v3 --- [refs] | 2 +- trunk/fs/btrfs/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7980c17c2bc2..13c37deb74b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a1413a296d38b54ded651e76ef16c033d38fd5d +refs/heads/master: 8247b41ac980d125de8aeba6f33f381056ac0ecb diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c index 4119f9a95320..934bc094bf17 100644 --- a/trunk/fs/btrfs/file.c +++ b/trunk/fs/btrfs/file.c @@ -436,7 +436,7 @@ int noinline btrfs_drop_extents(struct btrfs_trans_handle *trans, goto out; } if (recow) { - search_start = key.offset; + search_start = max(key.offset, start); continue; } if (btrfs_key_type(&key) == BTRFS_EXTENT_DATA_KEY) {