From: Chris Mason Date: Thu, 17 Jan 2008 17:01:41 +0000 (-0500) Subject: Btrfs: Use blk_congestion_wait on older kernels X-Git-Tag: v2.6.29-rc1~27^2~9^2~55^2~56^2~30^2~328 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04005cc7a1feef94237204566ccac38571af7991;hp=fb4bc1e0565a842d704846005ac0ec739e608ede;p=pandora-kernel.git Btrfs: Use blk_congestion_wait on older kernels Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index cd29922d4073..731a534f81f5 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -919,8 +919,13 @@ void btrfs_throttle(struct btrfs_root *root) struct backing_dev_info *bdi; bdi = root->fs_info->sb->s_bdev->bd_inode->i_mapping->backing_dev_info; - if (root->fs_info->throttles && bdi_write_congested(bdi)) + if (root->fs_info->throttles && bdi_write_congested(bdi)) { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18) congestion_wait(WRITE, HZ/20); +#else + blk_congestion_wait(WRITE, HZ/20); +#endif + } } void btrfs_btree_balance_dirty(struct btrfs_root *root, unsigned long nr)