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

[PATCH] cleanup hugelbfs_forget_inode

Browse source 
Reformat hugelbfs_forget_inode and add the missing but harmless
write_inode_now call.  It looks the same as generic_forget_inode now except
for the call to truncate_hugepages instead of truncate_inode_pages.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christoph Hellwig 2005-10-29 18:16:45 -07:00 committed by Linus Torvalds
parent 6b09b9df05
commit 0b1533f67c
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
fs/hugetlbfs/inode.c
View file

@ -231,25 +231,28 @@ static void hugetlbfs_delete_inode(struct inode *inode)
static void hugetlbfs_forget_inode(struct inode *inode) static void hugetlbfs_forget_inode(struct inode *inode)
{ {
struct super_block *super_block = inode->i_sb; struct super_block *sb = inode->i_sb;
if (hlist_unhashed(&inode->i_hash)) if (!hlist_unhashed(&inode->i_hash)) {
goto out_truncate; if (!(inode->i_state & (I_DIRTY|I_LOCK)))
list_move(&inode->i_list, &inode_unused);
if (!(inode->i_state & (I_DIRTY|I_LOCK))) {
list_del(&inode->i_list);
list_add(&inode->i_list, &inode_unused);
}
inodes_stat.nr_unused++; inodes_stat.nr_unused++;
if (!super_block || (super_block->s_flags & MS_ACTIVE)) { if (!sb || (sb->s_flags & MS_ACTIVE)) {
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
return; return;
} }
inode->i_state |= I_WILL_FREE;
/* write_inode_now() ? */ spin_unlock(&inode_lock);
/*
* write_inode_now is a noop as we set BDI_CAP_NO_WRITEBACK
* in our backing_dev_info.
*/
write_inode_now(inode, 1);
spin_lock(&inode_lock);
inode->i_state &= ~I_WILL_FREE;
inodes_stat.nr_unused--; inodes_stat.nr_unused--;
hlist_del_init(&inode->i_hash); hlist_del_init(&inode->i_hash);
out_truncate: }
list_del_init(&inode->i_list); list_del_init(&inode->i_list);
list_del_init(&inode->i_sb_list); list_del_init(&inode->i_sb_list);
inode->i_state |= I_FREEING; inode->i_state |= I_FREEING;
@ -257,7 +260,6 @@ static void hugetlbfs_forget_inode(struct inode *inode)
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
if (inode->i_data.nrpages) if (inode->i_data.nrpages)
truncate_hugepages(&inode->i_data, 0); truncate_hugepages(&inode->i_data, 0);
clear_inode(inode); clear_inode(inode);
destroy_inode(inode); destroy_inode(inode);
} }