Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[net-next-2.6.git] / fs / btrfs / extent-tree.c

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index d61a799fe32329ac58acb3a27b99643d193a7b3b..b9080d71991a35cea63d2620d1534234cde6e0a9 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1696,7 +1696,7 @@ static void btrfs_issue_discard(struct block_device *bdev,
                                u64 start, u64 len)
 {
        blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,
-                            DISCARD_FL_BARRIER);
+                       BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER);
 }
 
 static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,
@@ -2944,6 +2944,7 @@ alloc:
                        goto again;
                }
 
+#if 0 /* I hope we never need this code again, just in case */
                printk(KERN_ERR "no space left, need %llu, %llu bytes_used, "
                       "%llu bytes_reserved, " "%llu bytes_pinned, "
                       "%llu bytes_readonly, %llu may use %llu total\n",
@@ -2954,6 +2955,7 @@ alloc:
                       (unsigned long long)data_sinfo->bytes_readonly,
                       (unsigned long long)data_sinfo->bytes_may_use,
                       (unsigned long long)data_sinfo->total_bytes);
+#endif
                return -ENOSPC;
        }
        data_sinfo->bytes_may_use += bytes;