Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs...

[pandora-kernel.git] / fs / btrfs / scrub.c

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index a31f2a9..87a2f12 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -370,7 +370,7 @@ static int scrub_fixup_io(int rw, struct block_device *bdev, sector_t sector,
        DECLARE_COMPLETION_ONSTACK(complete);
 
        /* we are going to wait on this IO */
-       rw |= REQ_SYNC | REQ_UNPLUG;
+       rw |= REQ_SYNC;
 
        bio = bio_alloc(GFP_NOFS, 1);
        bio->bi_bdev = bdev;
@@ -819,7 +819,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_dev *sdev,
 
                        path->slots[0]++;
                }
-               btrfs_release_path(root, path);
+               btrfs_release_path(path);
                logical += increment;
                physical += map->stripe_len;
                cond_resched();
@@ -960,7 +960,7 @@ again:
 next:
                        path->slots[0]++;
                }
-               btrfs_release_path(root, path);
+               btrfs_release_path(path);
                logical += increment;
                physical += map->stripe_len;
                spin_lock(&sdev->stat_lock);
@@ -1071,7 +1071,7 @@ int scrub_enumerate_chunks(struct scrub_dev *sdev, u64 start, u64 end)
 
                if (found_key.offset + length <= start) {
                        key.offset = found_key.offset + length;
-                       btrfs_release_path(root, path);
+                       btrfs_release_path(path);
                        continue;
                }
 
@@ -1095,7 +1095,7 @@ int scrub_enumerate_chunks(struct scrub_dev *sdev, u64 start, u64 end)
                        break;
 
                key.offset = found_key.offset + length;
-               btrfs_release_path(root, path);
+               btrfs_release_path(path);
        }
 
 out: