Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nilfs2: remove nilfs_direct_operations from direct mapping

Browse source 
will remove indirect function calls using nilfs_direct_operations
table.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi 2009-05-24 16:46:37 +09:00
parent d4b961576d
commit 355c6b6103
2 changed files with 10 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
fs/nilfs2/direct.c
View file

@ -90,8 +90,8 @@ static int nilfs_direct_prepare_insert(struct nilfs_direct *direct,
{ {
int ret; int ret;
if (direct->d_ops->dop_find_target != NULL) if (NILFS_BMAP_USE_VBN(&direct->d_bmap))
req->bpr_ptr = direct->d_ops->dop_find_target(direct, key); req->bpr_ptr = nilfs_direct_find_target_v(direct, key);
ret = nilfs_bmap_prepare_alloc_ptr(&direct->d_bmap, req); ret = nilfs_bmap_prepare_alloc_ptr(&direct->d_bmap, req);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -116,8 +116,8 @@ static void nilfs_direct_commit_insert(struct nilfs_direct *direct,
if (!nilfs_bmap_dirty(&direct->d_bmap)) if (!nilfs_bmap_dirty(&direct->d_bmap))
nilfs_bmap_set_dirty(&direct->d_bmap); nilfs_bmap_set_dirty(&direct->d_bmap);
if (direct->d_ops->dop_set_target != NULL) if (NILFS_BMAP_USE_VBN(&direct->d_bmap))
direct->d_ops->dop_set_target(direct, key, req->bpr_ptr); nilfs_direct_set_target_v(direct, key, req->bpr_ptr);
} }
static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr) static int nilfs_direct_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
@ -297,12 +297,10 @@ static int nilfs_direct_propagate_v(struct nilfs_direct *direct,
static int nilfs_direct_propagate(const struct nilfs_bmap *bmap, static int nilfs_direct_propagate(const struct nilfs_bmap *bmap,
struct buffer_head *bh) struct buffer_head *bh)
{ {
struct nilfs_direct *direct; struct nilfs_direct *direct = (struct nilfs_direct *)bmap;
direct = (struct nilfs_direct *)bmap; return NILFS_BMAP_USE_VBN(bmap) ?
return (direct->d_ops->dop_propagate != NULL) ? nilfs_direct_propagate_v(direct, bh) : 0;
direct->d_ops->dop_propagate(direct, bh) :
0;
} }
static int nilfs_direct_assign_v(struct nilfs_direct *direct, static int nilfs_direct_assign_v(struct nilfs_direct *direct,
@ -362,8 +360,9 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap,
return -EINVAL; return -EINVAL;
} }
return direct->d_ops->dop_assign(direct, key, ptr, bh, return NILFS_BMAP_USE_VBN(bmap) ?
blocknr, binfo); nilfs_direct_assign_v(direct, key, ptr, bh, blocknr, binfo) :
nilfs_direct_assign_p(direct, key, ptr, bh, blocknr, binfo);
} }
static const struct nilfs_bmap_operations nilfs_direct_ops = { static const struct nilfs_bmap_operations nilfs_direct_ops = {
@ -386,33 +385,8 @@ static const struct nilfs_bmap_operations nilfs_direct_ops = {
}; };
static const struct nilfs_direct_operations nilfs_direct_ops_v = {
.dop_find_target = nilfs_direct_find_target_v,
.dop_set_target = nilfs_direct_set_target_v,
.dop_propagate = nilfs_direct_propagate_v,
.dop_assign = nilfs_direct_assign_v,
};
static const struct nilfs_direct_operations nilfs_direct_ops_p = {
.dop_find_target = NULL,
.dop_set_target = NULL,
.dop_propagate = NULL,
.dop_assign = nilfs_direct_assign_p,
};
int nilfs_direct_init(struct nilfs_bmap *bmap) int nilfs_direct_init(struct nilfs_bmap *bmap)
{ {
struct nilfs_direct *direct = (struct nilfs_direct *)bmap;
bmap->b_ops = &nilfs_direct_ops; bmap->b_ops = &nilfs_direct_ops;
switch (bmap->b_inode->i_ino) {
case NILFS_DAT_INO:
direct->d_ops = &nilfs_direct_ops_p;
break;
default:
direct->d_ops = &nilfs_direct_ops_v;
break;
}
return 0; return 0;
} }

16
fs/nilfs2/direct.h
View file

@ -30,18 +30,6 @@
struct nilfs_direct; struct nilfs_direct;
/**
* struct nilfs_direct_operations - direct mapping operation table
*/
struct nilfs_direct_operations {
__u64 (*dop_find_target)(const struct nilfs_direct *, __u64);
void (*dop_set_target)(struct nilfs_direct *, __u64, __u64);
int (*dop_propagate)(struct nilfs_direct *, struct buffer_head *);
int (*dop_assign)(struct nilfs_direct *, __u64, __u64,
struct buffer_head **, sector_t,
union nilfs_binfo *);
};
/** /**
* struct nilfs_direct_node - direct node * struct nilfs_direct_node - direct node
* @dn_flags: flags * @dn_flags: flags
@ -55,13 +43,9 @@ struct nilfs_direct_node {
/** /**
* struct nilfs_direct - direct mapping * struct nilfs_direct - direct mapping
* @d_bmap: bmap structure * @d_bmap: bmap structure
* @d_ops: direct mapping operation table
*/ */
struct nilfs_direct { struct nilfs_direct {
struct nilfs_bmap d_bmap; struct nilfs_bmap d_bmap;
/* direct-mapping-specific members */
const struct nilfs_direct_operations *d_ops;
}; };