aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-03-26 10:28:07 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:01 -0400
commit04160088141a6be06d5cb9e53e34076b51803ffc (patch)
tree8dc407b1fe8fced2588121e8d58450f3a8ed8807 /fs
parent593060d756e0c2382d59cf00d5f3b9e3a336c408 (diff)
Create a btrfs backing dev info
This allows intelligent versions of unplug and congestion functions Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/disk-io.c53
-rw-r--r--fs/btrfs/inode.c5
3 files changed, 60 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f43dfe7ffe6d..fec96ba7c23b 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -25,6 +25,7 @@
25#include <linux/fs.h> 25#include <linux/fs.h>
26#include <linux/workqueue.h> 26#include <linux/workqueue.h>
27#include <linux/completion.h> 27#include <linux/completion.h>
28#include <linux/backing-dev.h>
28#include <asm/kmap_types.h> 29#include <asm/kmap_types.h>
29#include "bit-radix.h" 30#include "bit-radix.h"
30#include "extent_io.h" 31#include "extent_io.h"
@@ -472,6 +473,7 @@ struct btrfs_fs_info {
472 struct block_device *__bdev; 473 struct block_device *__bdev;
473 struct super_block *sb; 474 struct super_block *sb;
474 struct inode *btree_inode; 475 struct inode *btree_inode;
476 struct backing_dev_info bdi;
475 spinlock_t hash_lock; 477 spinlock_t hash_lock;
476 struct mutex trans_mutex; 478 struct mutex trans_mutex;
477 struct mutex fs_mutex; 479 struct mutex fs_mutex;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index d8474796dea2..6a70e4916ab4 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -655,6 +655,55 @@ static int add_hasher(struct btrfs_fs_info *info, char *type) {
655 return 0; 655 return 0;
656} 656}
657#endif 657#endif
658
659static int btrfs_congested_fn(void *congested_data, int bdi_bits)
660{
661 struct btrfs_fs_info *info = (struct btrfs_fs_info *)congested_data;
662 int ret = 0;
663 struct list_head *cur;
664 struct btrfs_device *device;
665 struct backing_dev_info *bdi;
666
667 list_for_each(cur, &info->fs_devices->devices) {
668 device = list_entry(cur, struct btrfs_device, dev_list);
669 bdi = blk_get_backing_dev_info(device->bdev);
670 if (bdi && bdi_congested(bdi, bdi_bits)) {
671 ret = 1;
672 break;
673 }
674 }
675 return ret;
676}
677
678void btrfs_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
679{
680 struct list_head *cur;
681 struct btrfs_device *device;
682 struct btrfs_fs_info *info;
683
684 info = (struct btrfs_fs_info *)bdi->unplug_io_data;
685 list_for_each(cur, &info->fs_devices->devices) {
686 device = list_entry(cur, struct btrfs_device, dev_list);
687 bdi = blk_get_backing_dev_info(device->bdev);
688 if (bdi->unplug_io_fn) {
689 bdi->unplug_io_fn(bdi, page);
690 }
691 }
692}
693
694static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)
695{
696 bdi_init(bdi);
697 bdi->ra_pages = default_backing_dev_info.ra_pages;
698 bdi->state = 0;
699 bdi->capabilities = default_backing_dev_info.capabilities;
700 bdi->unplug_io_fn = btrfs_unplug_io_fn;
701 bdi->unplug_io_data = info;
702 bdi->congested_fn = btrfs_congested_fn;
703 bdi->congested_data = info;
704 return 0;
705}
706
658struct btrfs_root *open_ctree(struct super_block *sb, 707struct btrfs_root *open_ctree(struct super_block *sb,
659 struct btrfs_fs_devices *fs_devices) 708 struct btrfs_fs_devices *fs_devices)
660{ 709{
@@ -708,11 +757,14 @@ struct btrfs_root *open_ctree(struct super_block *sb,
708 fs_info->max_extent = (u64)-1; 757 fs_info->max_extent = (u64)-1;
709 fs_info->max_inline = 8192 * 1024; 758 fs_info->max_inline = 8192 * 1024;
710 fs_info->delalloc_bytes = 0; 759 fs_info->delalloc_bytes = 0;
760 setup_bdi(fs_info, &fs_info->bdi);
711 fs_info->btree_inode = new_inode(sb); 761 fs_info->btree_inode = new_inode(sb);
712 fs_info->btree_inode->i_ino = 1; 762 fs_info->btree_inode->i_ino = 1;
713 fs_info->btree_inode->i_nlink = 1; 763 fs_info->btree_inode->i_nlink = 1;
714 fs_info->btree_inode->i_size = sb->s_bdev->bd_inode->i_size; 764 fs_info->btree_inode->i_size = sb->s_bdev->bd_inode->i_size;
715 fs_info->btree_inode->i_mapping->a_ops = &btree_aops; 765 fs_info->btree_inode->i_mapping->a_ops = &btree_aops;
766 fs_info->btree_inode->i_mapping->backing_dev_info = &fs_info->bdi;
767
716 extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree, 768 extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree,
717 fs_info->btree_inode->i_mapping, 769 fs_info->btree_inode->i_mapping,
718 GFP_NOFS); 770 GFP_NOFS);
@@ -992,6 +1044,7 @@ int close_ctree(struct btrfs_root *root)
992#endif 1044#endif
993 close_all_devices(fs_info); 1045 close_all_devices(fs_info);
994 btrfs_mapping_tree_free(&fs_info->mapping_tree); 1046 btrfs_mapping_tree_free(&fs_info->mapping_tree);
1047 bdi_destroy(&fs_info->bdi);
995 1048
996 kfree(fs_info->extent_root); 1049 kfree(fs_info->extent_root);
997 kfree(fs_info->tree_root); 1050 kfree(fs_info->tree_root);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index db60d85598ce..0fa7cf227f1a 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -494,6 +494,7 @@ void btrfs_read_locked_inode(struct inode *inode)
494 switch (inode->i_mode & S_IFMT) { 494 switch (inode->i_mode & S_IFMT) {
495 case S_IFREG: 495 case S_IFREG:
496 inode->i_mapping->a_ops = &btrfs_aops; 496 inode->i_mapping->a_ops = &btrfs_aops;
497 inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
497 BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops; 498 BTRFS_I(inode)->io_tree.ops = &btrfs_extent_io_ops;
498 inode->i_fop = &btrfs_file_operations; 499 inode->i_fop = &btrfs_file_operations;
499 inode->i_op = &btrfs_file_inode_operations; 500 inode->i_op = &btrfs_file_inode_operations;
@@ -508,6 +509,7 @@ void btrfs_read_locked_inode(struct inode *inode)
508 case S_IFLNK: 509 case S_IFLNK:
509 inode->i_op = &btrfs_symlink_inode_operations; 510 inode->i_op = &btrfs_symlink_inode_operations;
510 inode->i_mapping->a_ops = &btrfs_symlink_aops; 511 inode->i_mapping->a_ops = &btrfs_symlink_aops;
512 inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
511 break; 513 break;
512 default: 514 default:
513 init_special_inode(inode, inode->i_mode, rdev); 515 init_special_inode(inode, inode->i_mode, rdev);
@@ -1792,6 +1794,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
1792 drop_inode = 1; 1794 drop_inode = 1;
1793 else { 1795 else {
1794 inode->i_mapping->a_ops = &btrfs_aops; 1796 inode->i_mapping->a_ops = &btrfs_aops;
1797 inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
1795 inode->i_fop = &btrfs_file_operations; 1798 inode->i_fop = &btrfs_file_operations;
1796 inode->i_op = &btrfs_file_inode_operations; 1799 inode->i_op = &btrfs_file_inode_operations;
1797 extent_map_tree_init(&BTRFS_I(inode)->extent_tree, GFP_NOFS); 1800 extent_map_tree_init(&BTRFS_I(inode)->extent_tree, GFP_NOFS);
@@ -2960,6 +2963,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
2960 drop_inode = 1; 2963 drop_inode = 1;
2961 else { 2964 else {
2962 inode->i_mapping->a_ops = &btrfs_aops; 2965 inode->i_mapping->a_ops = &btrfs_aops;
2966 inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
2963 inode->i_fop = &btrfs_file_operations; 2967 inode->i_fop = &btrfs_file_operations;
2964 inode->i_op = &btrfs_file_inode_operations; 2968 inode->i_op = &btrfs_file_inode_operations;
2965 extent_map_tree_init(&BTRFS_I(inode)->extent_tree, GFP_NOFS); 2969 extent_map_tree_init(&BTRFS_I(inode)->extent_tree, GFP_NOFS);
@@ -2999,6 +3003,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
2999 3003
3000 inode->i_op = &btrfs_symlink_inode_operations; 3004 inode->i_op = &btrfs_symlink_inode_operations;
3001 inode->i_mapping->a_ops = &btrfs_symlink_aops; 3005 inode->i_mapping->a_ops = &btrfs_symlink_aops;
3006 inode->i_mapping->backing_dev_info = &root->fs_info->bdi;
3002 inode->i_size = name_len - 1; 3007 inode->i_size = name_len - 1;
3003 err = btrfs_update_inode(trans, root, inode); 3008 err = btrfs_update_inode(trans, root, inode);
3004 if (err) 3009 if (err)