switch bfs to ->evict_inode(), clean up
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
ac14a95b52
commit
9df2f85128
|
@ -99,6 +99,24 @@ error:
|
||||||
return ERR_PTR(-EIO);
|
return ERR_PTR(-EIO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct bfs_inode *find_inode(struct super_block *sb, u16 ino, struct buffer_head **p)
|
||||||
|
{
|
||||||
|
if ((ino < BFS_ROOT_INO) || (ino > BFS_SB(sb)->si_lasti)) {
|
||||||
|
printf("Bad inode number %s:%08x\n", sb->s_id, ino);
|
||||||
|
return ERR_PTR(-EIO);
|
||||||
|
}
|
||||||
|
|
||||||
|
ino -= BFS_ROOT_INO;
|
||||||
|
|
||||||
|
*p = sb_bread(sb, 1 + ino / BFS_INODES_PER_BLOCK);
|
||||||
|
if (!*p) {
|
||||||
|
printf("Unable to read inode %s:%08x\n", sb->s_id, ino);
|
||||||
|
return ERR_PTR(-EIO);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (struct bfs_inode *)(*p)->b_data + ino % BFS_INODES_PER_BLOCK;
|
||||||
|
}
|
||||||
|
|
||||||
static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
|
static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
|
||||||
{
|
{
|
||||||
struct bfs_sb_info *info = BFS_SB(inode->i_sb);
|
struct bfs_sb_info *info = BFS_SB(inode->i_sb);
|
||||||
|
@ -106,28 +124,15 @@ static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
|
||||||
unsigned long i_sblock;
|
unsigned long i_sblock;
|
||||||
struct bfs_inode *di;
|
struct bfs_inode *di;
|
||||||
struct buffer_head *bh;
|
struct buffer_head *bh;
|
||||||
int block, off;
|
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
dprintf("ino=%08x\n", ino);
|
dprintf("ino=%08x\n", ino);
|
||||||
|
|
||||||
if ((ino < BFS_ROOT_INO) || (ino > BFS_SB(inode->i_sb)->si_lasti)) {
|
di = find_inode(inode->i_sb, ino, &bh);
|
||||||
printf("Bad inode number %s:%08x\n", inode->i_sb->s_id, ino);
|
if (IS_ERR(di))
|
||||||
return -EIO;
|
return PTR_ERR(di);
|
||||||
}
|
|
||||||
|
|
||||||
mutex_lock(&info->bfs_lock);
|
mutex_lock(&info->bfs_lock);
|
||||||
block = (ino - BFS_ROOT_INO) / BFS_INODES_PER_BLOCK + 1;
|
|
||||||
bh = sb_bread(inode->i_sb, block);
|
|
||||||
if (!bh) {
|
|
||||||
printf("Unable to read inode %s:%08x\n",
|
|
||||||
inode->i_sb->s_id, ino);
|
|
||||||
mutex_unlock(&info->bfs_lock);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
off = (ino - BFS_ROOT_INO) % BFS_INODES_PER_BLOCK;
|
|
||||||
di = (struct bfs_inode *)bh->b_data + off;
|
|
||||||
|
|
||||||
if (ino == BFS_ROOT_INO)
|
if (ino == BFS_ROOT_INO)
|
||||||
di->i_vtype = cpu_to_le32(BFS_VDIR);
|
di->i_vtype = cpu_to_le32(BFS_VDIR);
|
||||||
|
@ -158,12 +163,11 @@ static int bfs_write_inode(struct inode *inode, struct writeback_control *wbc)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void bfs_delete_inode(struct inode *inode)
|
static void bfs_evict_inode(struct inode *inode)
|
||||||
{
|
{
|
||||||
unsigned long ino = inode->i_ino;
|
unsigned long ino = inode->i_ino;
|
||||||
struct bfs_inode *di;
|
struct bfs_inode *di;
|
||||||
struct buffer_head *bh;
|
struct buffer_head *bh;
|
||||||
int block, off;
|
|
||||||
struct super_block *s = inode->i_sb;
|
struct super_block *s = inode->i_sb;
|
||||||
struct bfs_sb_info *info = BFS_SB(s);
|
struct bfs_sb_info *info = BFS_SB(s);
|
||||||
struct bfs_inode_info *bi = BFS_I(inode);
|
struct bfs_inode_info *bi = BFS_I(inode);
|
||||||
|
@ -171,28 +175,19 @@ static void bfs_delete_inode(struct inode *inode)
|
||||||
dprintf("ino=%08lx\n", ino);
|
dprintf("ino=%08lx\n", ino);
|
||||||
|
|
||||||
truncate_inode_pages(&inode->i_data, 0);
|
truncate_inode_pages(&inode->i_data, 0);
|
||||||
|
invalidate_inode_buffers(inode);
|
||||||
|
end_writeback(inode);
|
||||||
|
|
||||||
if ((ino < BFS_ROOT_INO) || (ino > info->si_lasti)) {
|
if (inode->i_nlink)
|
||||||
printf("invalid ino=%08lx\n", ino);
|
return;
|
||||||
|
|
||||||
|
di = find_inode(s, inode->i_ino, &bh);
|
||||||
|
if (IS_ERR(di))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
inode->i_size = 0;
|
|
||||||
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
|
|
||||||
mutex_lock(&info->bfs_lock);
|
mutex_lock(&info->bfs_lock);
|
||||||
mark_inode_dirty(inode);
|
/* clear on-disk inode */
|
||||||
|
memset(di, 0, sizeof(struct bfs_inode));
|
||||||
block = (ino - BFS_ROOT_INO) / BFS_INODES_PER_BLOCK + 1;
|
|
||||||
bh = sb_bread(s, block);
|
|
||||||
if (!bh) {
|
|
||||||
printf("Unable to read inode %s:%08lx\n",
|
|
||||||
inode->i_sb->s_id, ino);
|
|
||||||
mutex_unlock(&info->bfs_lock);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
off = (ino - BFS_ROOT_INO) % BFS_INODES_PER_BLOCK;
|
|
||||||
di = (struct bfs_inode *)bh->b_data + off;
|
|
||||||
memset((void *)di, 0, sizeof(struct bfs_inode));
|
|
||||||
mark_buffer_dirty(bh);
|
mark_buffer_dirty(bh);
|
||||||
brelse(bh);
|
brelse(bh);
|
||||||
|
|
||||||
|
@ -214,7 +209,6 @@ static void bfs_delete_inode(struct inode *inode)
|
||||||
mark_buffer_dirty(info->si_sbh);
|
mark_buffer_dirty(info->si_sbh);
|
||||||
}
|
}
|
||||||
mutex_unlock(&info->bfs_lock);
|
mutex_unlock(&info->bfs_lock);
|
||||||
clear_inode(inode);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bfs_sync_fs(struct super_block *sb, int wait)
|
static int bfs_sync_fs(struct super_block *sb, int wait)
|
||||||
|
@ -319,7 +313,7 @@ static const struct super_operations bfs_sops = {
|
||||||
.alloc_inode = bfs_alloc_inode,
|
.alloc_inode = bfs_alloc_inode,
|
||||||
.destroy_inode = bfs_destroy_inode,
|
.destroy_inode = bfs_destroy_inode,
|
||||||
.write_inode = bfs_write_inode,
|
.write_inode = bfs_write_inode,
|
||||||
.delete_inode = bfs_delete_inode,
|
.evict_inode = bfs_evict_inode,
|
||||||
.put_super = bfs_put_super,
|
.put_super = bfs_put_super,
|
||||||
.write_super = bfs_write_super,
|
.write_super = bfs_write_super,
|
||||||
.sync_fs = bfs_sync_fs,
|
.sync_fs = bfs_sync_fs,
|
||||||
|
|
Loading…
Reference in a new issue