---

yaml --- r: 128733 b: refs/heads/master c: 4575c9c h: refs/heads/master i: 128731: 6246454 v: v3
git-mirror · Sep 25, 2008 · dd15bc6 · dd15bc6
1 parent 67c233b
commit dd15bc6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ad6b7bc2e00ba02f915cffd5b6bcd6564bb2c75
+refs/heads/master: 4575c9cceeca2f51c50536850e15e1dc5187f3d9
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
@@ -932,7 +932,7 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
 	bdi_init(bdi);
 #endif
-	bdi->ra_pages	= default_backing_dev_info.ra_pages * 4;
+	bdi->ra_pages	= default_backing_dev_info.ra_pages;
 	bdi->state		= 0;
 	bdi->capabilities	= default_backing_dev_info.capabilities;
 	bdi->unplug_io_fn	= btrfs_unplug_io_fn;
@@ -1214,6 +1214,8 @@ struct btrfs_root *open_ctree(struct super_block *sb,
 		       (unsigned long long)fs_devices->num_devices);
 		goto fail_sb_buffer;
 	}
+	fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super);
+
 	nodesize = btrfs_super_nodesize(disk_super);
 	leafsize = btrfs_super_leafsize(disk_super);
 	sectorsize = btrfs_super_sectorsize(disk_super);