nilfs2: unfold nilfs_dat_inode function
nilfs_dat_inode function was a wrapper to switch between normal dat inode and gcdat, a clone of the dat inode for garbage collection. This function got obsolete when the gcdat inode was removed, and now we can access the dat inode directly from a nilfs object. So, we will unfold the wrapper and remove it. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
@@ -233,7 +233,7 @@ nilfs_ioctl_do_get_vinfo(struct the_nilfs *nilfs, __u64 *posp, int flags,
|
||||
int ret;
|
||||
|
||||
down_read(&nilfs->ns_segctor_sem);
|
||||
ret = nilfs_dat_get_vinfo(nilfs_dat_inode(nilfs), buf, size, nmembs);
|
||||
ret = nilfs_dat_get_vinfo(nilfs->ns_dat, buf, size, nmembs);
|
||||
up_read(&nilfs->ns_segctor_sem);
|
||||
return ret;
|
||||
}
|
||||
@@ -242,8 +242,7 @@ static ssize_t
|
||||
nilfs_ioctl_do_get_bdescs(struct the_nilfs *nilfs, __u64 *posp, int flags,
|
||||
void *buf, size_t size, size_t nmembs)
|
||||
{
|
||||
struct inode *dat = nilfs_dat_inode(nilfs);
|
||||
struct nilfs_bmap *bmap = NILFS_I(dat)->i_bmap;
|
||||
struct nilfs_bmap *bmap = NILFS_I(nilfs->ns_dat)->i_bmap;
|
||||
struct nilfs_bdesc *bdescs = buf;
|
||||
int ret, i;
|
||||
|
||||
@@ -421,7 +420,7 @@ static int nilfs_ioctl_free_vblocknrs(struct the_nilfs *nilfs,
|
||||
size_t nmembs = argv->v_nmembs;
|
||||
int ret;
|
||||
|
||||
ret = nilfs_dat_freev(nilfs_dat_inode(nilfs), buf, nmembs);
|
||||
ret = nilfs_dat_freev(nilfs->ns_dat, buf, nmembs);
|
||||
|
||||
return (ret < 0) ? ret : nmembs;
|
||||
}
|
||||
@@ -430,8 +429,7 @@ static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs,
|
||||
struct nilfs_argv *argv, void *buf)
|
||||
{
|
||||
size_t nmembs = argv->v_nmembs;
|
||||
struct inode *dat = nilfs_dat_inode(nilfs);
|
||||
struct nilfs_bmap *bmap = NILFS_I(dat)->i_bmap;
|
||||
struct nilfs_bmap *bmap = NILFS_I(nilfs->ns_dat)->i_bmap;
|
||||
struct nilfs_bdesc *bdescs = buf;
|
||||
int ret, i;
|
||||
|
||||
@@ -450,7 +448,7 @@ static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs,
|
||||
/* skip dead block */
|
||||
continue;
|
||||
if (bdescs[i].bd_level == 0) {
|
||||
ret = nilfs_mdt_mark_block_dirty(dat,
|
||||
ret = nilfs_mdt_mark_block_dirty(nilfs->ns_dat,
|
||||
bdescs[i].bd_offset);
|
||||
if (ret < 0) {
|
||||
WARN_ON(ret == -ENOENT);
|
||||
|
Reference in New Issue
Block a user