diff options
| author |   Liu Bo <liubo2009@cn.fujitsu.com> | 2012-06-14 02:23:21 -0600 |
|---|---|---|
| committer |   Chris Mason <chris.mason@fusionio.com> | 2012-06-15 11:42:27 -0400 |
| commit | ed0eaa14981e87a1e185b61e4ef621c440e3930c (patch) | |
| tree | 2fa743dc69cb3810bb577494f8ee6f1b3f4f9323 | |
| parent | Btrfs: avoid memory leak of extent state in error handling routine (diff) | |
| download | linux-dev-ed0eaa14981e87a1e185b61e4ef621c440e3930c.tar.xz linux-dev-ed0eaa14981e87a1e185b61e4ef621c440e3930c.zip | |
Btrfs: make sure that we've made everything in pinned tree clean
Since we have two trees for recording pinned extents, we need to go through
both of them to make sure that we've done everything clean.
Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | fs/btrfs/disk-io.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 63a36232788b..ffdd76bf05d4 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3557,8 +3557,10 @@ static int btrfs_destroy_pinned_extent(struct btrfs_root *root, u64 start; u64 end; int ret; + bool loop = true; unpin = pinned_extents; +again: while (1) { ret = find_first_extent_bit(unpin, 0, &start, &end, EXTENT_DIRTY); @@ -3576,6 +3578,15 @@ static int btrfs_destroy_pinned_extent(struct btrfs_root *root, cond_resched(); } + if (loop) { + if (unpin == &root->fs_info->freed_extents[0]) + unpin = &root->fs_info->freed_extents[1]; + else + unpin = &root->fs_info->freed_extents[0]; + loop = false; + goto again; + } + return 0; } |