lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unify fs/inode.c callers of clear_inode()

Browse Source 
For now, just a straightforward merge

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2010-06-04 19:33:20 -04:00
parent a4ffdde6e5
commit b4272d4c81
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
fs/inode.c
View File

@@ -321,6 +321,19 @@ void clear_inode(struct inode *inode)
} }
EXPORT_SYMBOL(clear_inode); EXPORT_SYMBOL(clear_inode);
static void evict(struct inode *inode, int delete)
{
const struct super_operations *op = inode->i_sb->s_op;
if (delete && op->delete_inode) {
op->delete_inode(inode);
} else {
if (inode->i_data.nrpages)
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
}
}
/* /*
* dispose_list - dispose of the contents of a local list * dispose_list - dispose of the contents of a local list
* @head: the head of the list to free * @head: the head of the list to free
@@ -338,9 +351,7 @@ static void dispose_list(struct list_head *head)
inode = list_first_entry(head, struct inode, i_list); inode = list_first_entry(head, struct inode, i_list);
list_del(&inode->i_list); list_del(&inode->i_list);
if (inode->i_data.nrpages) evict(inode, 0);
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
spin_lock(&inode_lock); spin_lock(&inode_lock);
hlist_del_init(&inode->i_hash); hlist_del_init(&inode->i_hash);
@@ -1194,8 +1205,6 @@ EXPORT_SYMBOL(remove_inode_hash);
*/ */
void generic_delete_inode(struct inode *inode) void generic_delete_inode(struct inode *inode)
{ {
const struct super_operations *op = inode->i_sb->s_op;
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);
WARN_ON(inode->i_state & I_NEW); WARN_ON(inode->i_state & I_NEW);
@@ -1203,17 +1212,8 @@ void generic_delete_inode(struct inode *inode)
inodes_stat.nr_inodes--; inodes_stat.nr_inodes--;
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
if (op->delete_inode) { evict(inode, 1);
void (*delete)(struct inode *) = op->delete_inode;
/* Filesystems implementing their own
* s_op->delete_inode are required to call
* truncate_inode_pages and clear_inode()
* internally */
delete(inode);
} else {
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
}
spin_lock(&inode_lock); spin_lock(&inode_lock);
hlist_del_init(&inode->i_hash); hlist_del_init(&inode->i_hash);
spin_unlock(&inode_lock); spin_unlock(&inode_lock);
@@ -1268,9 +1268,7 @@ static void generic_forget_inode(struct inode *inode)
{ {
if (!generic_detach_inode(inode)) if (!generic_detach_inode(inode))
return; return;
if (inode->i_data.nrpages) evict(inode, 0);
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
wake_up_inode(inode); wake_up_inode(inode);
destroy_inode(inode); destroy_inode(inode);
} }