Commit a53b4751 authored by Ryusuke Konishi's avatar Ryusuke Konishi

nilfs2: use device's backing_dev_info for btree node caches

Previously, default_backing_dev_info was used for the mapping of btree
node caches.  This uses device dependent backing_dev_info to allow
detailed control of the device for the btree node pages.
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 30c25be7
...@@ -48,13 +48,14 @@ void nilfs_btnode_cache_init_once(struct address_space *btnc) ...@@ -48,13 +48,14 @@ void nilfs_btnode_cache_init_once(struct address_space *btnc)
static struct address_space_operations def_btnode_aops; static struct address_space_operations def_btnode_aops;
void nilfs_btnode_cache_init(struct address_space *btnc) void nilfs_btnode_cache_init(struct address_space *btnc,
struct backing_dev_info *bdi)
{ {
btnc->host = NULL; /* can safely set to host inode ? */ btnc->host = NULL; /* can safely set to host inode ? */
btnc->flags = 0; btnc->flags = 0;
mapping_set_gfp_mask(btnc, GFP_NOFS); mapping_set_gfp_mask(btnc, GFP_NOFS);
btnc->assoc_mapping = NULL; btnc->assoc_mapping = NULL;
btnc->backing_dev_info = &default_backing_dev_info; btnc->backing_dev_info = bdi;
btnc->a_ops = &def_btnode_aops; btnc->a_ops = &def_btnode_aops;
} }
......
...@@ -38,7 +38,7 @@ struct nilfs_btnode_chkey_ctxt { ...@@ -38,7 +38,7 @@ struct nilfs_btnode_chkey_ctxt {
}; };
void nilfs_btnode_cache_init_once(struct address_space *); void nilfs_btnode_cache_init_once(struct address_space *);
void nilfs_btnode_cache_init(struct address_space *); void nilfs_btnode_cache_init(struct address_space *, struct backing_dev_info *);
void nilfs_btnode_cache_clear(struct address_space *); void nilfs_btnode_cache_clear(struct address_space *);
int nilfs_btnode_submit_block(struct address_space *, __u64, sector_t, int nilfs_btnode_submit_block(struct address_space *, __u64, sector_t,
struct buffer_head **, int); struct buffer_head **, int);
......
...@@ -449,7 +449,7 @@ struct inode * ...@@ -449,7 +449,7 @@ struct inode *
nilfs_mdt_new_common(struct the_nilfs *nilfs, struct super_block *sb, nilfs_mdt_new_common(struct the_nilfs *nilfs, struct super_block *sb,
ino_t ino, gfp_t gfp_mask) ino_t ino, gfp_t gfp_mask)
{ {
struct inode *inode = nilfs_alloc_inode(sb); struct inode *inode = nilfs_alloc_inode_common(nilfs);
if (!inode) if (!inode)
return NULL; return NULL;
......
...@@ -263,6 +263,7 @@ extern void nilfs_dirty_inode(struct inode *); ...@@ -263,6 +263,7 @@ extern void nilfs_dirty_inode(struct inode *);
extern struct dentry *nilfs_get_parent(struct dentry *); extern struct dentry *nilfs_get_parent(struct dentry *);
/* super.c */ /* super.c */
extern struct inode *nilfs_alloc_inode_common(struct the_nilfs *);
extern struct inode *nilfs_alloc_inode(struct super_block *); extern struct inode *nilfs_alloc_inode(struct super_block *);
extern void nilfs_destroy_inode(struct inode *); extern void nilfs_destroy_inode(struct inode *);
extern void nilfs_error(struct super_block *, const char *, const char *, ...) extern void nilfs_error(struct super_block *, const char *, const char *, ...)
......
...@@ -134,7 +134,7 @@ void nilfs_warning(struct super_block *sb, const char *function, ...@@ -134,7 +134,7 @@ void nilfs_warning(struct super_block *sb, const char *function,
static struct kmem_cache *nilfs_inode_cachep; static struct kmem_cache *nilfs_inode_cachep;
struct inode *nilfs_alloc_inode(struct super_block *sb) struct inode *nilfs_alloc_inode_common(struct the_nilfs *nilfs)
{ {
struct nilfs_inode_info *ii; struct nilfs_inode_info *ii;
...@@ -144,10 +144,15 @@ struct inode *nilfs_alloc_inode(struct super_block *sb) ...@@ -144,10 +144,15 @@ struct inode *nilfs_alloc_inode(struct super_block *sb)
ii->i_bh = NULL; ii->i_bh = NULL;
ii->i_state = 0; ii->i_state = 0;
ii->vfs_inode.i_version = 1; ii->vfs_inode.i_version = 1;
nilfs_btnode_cache_init(&ii->i_btnode_cache); nilfs_btnode_cache_init(&ii->i_btnode_cache, nilfs->ns_bdi);
return &ii->vfs_inode; return &ii->vfs_inode;
} }
struct inode *nilfs_alloc_inode(struct super_block *sb)
{
return nilfs_alloc_inode_common(NILFS_SB(sb)->s_nilfs);
}
void nilfs_destroy_inode(struct inode *inode) void nilfs_destroy_inode(struct inode *inode)
{ {
kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode)); kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment