diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-07 13:21:05 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:48:33 -0400 |
commit | 644da5960ded137c339bc69bc2aeac54f73aad59 (patch) | |
tree | b2ce4c69d95e5f3439db40adcc2e85d1bc3d6272 /fs | |
parent | 07958f9f5b9e8422c15368a1733a52ea99009896 (diff) |
fs/inode.c:evict() doesn't care about delete vs. non-delete paths now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c index 7a1bea9cb8ee..8320bef7177e 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -329,7 +329,7 @@ void clear_inode(struct inode *inode) | |||
329 | } | 329 | } |
330 | EXPORT_SYMBOL(clear_inode); | 330 | EXPORT_SYMBOL(clear_inode); |
331 | 331 | ||
332 | static void evict(struct inode *inode, int delete) | 332 | static void evict(struct inode *inode) |
333 | { | 333 | { |
334 | const struct super_operations *op = inode->i_sb->s_op; | 334 | const struct super_operations *op = inode->i_sb->s_op; |
335 | 335 | ||
@@ -363,7 +363,7 @@ static void dispose_list(struct list_head *head) | |||
363 | inode = list_first_entry(head, struct inode, i_list); | 363 | inode = list_first_entry(head, struct inode, i_list); |
364 | list_del(&inode->i_list); | 364 | list_del(&inode->i_list); |
365 | 365 | ||
366 | evict(inode, 0); | 366 | evict(inode); |
367 | 367 | ||
368 | spin_lock(&inode_lock); | 368 | spin_lock(&inode_lock); |
369 | hlist_del_init(&inode->i_hash); | 369 | hlist_del_init(&inode->i_hash); |
@@ -1224,7 +1224,7 @@ void generic_delete_inode(struct inode *inode) | |||
1224 | inodes_stat.nr_inodes--; | 1224 | inodes_stat.nr_inodes--; |
1225 | spin_unlock(&inode_lock); | 1225 | spin_unlock(&inode_lock); |
1226 | 1226 | ||
1227 | evict(inode, 1); | 1227 | evict(inode); |
1228 | 1228 | ||
1229 | spin_lock(&inode_lock); | 1229 | spin_lock(&inode_lock); |
1230 | hlist_del_init(&inode->i_hash); | 1230 | hlist_del_init(&inode->i_hash); |
@@ -1279,7 +1279,7 @@ static void generic_forget_inode(struct inode *inode) | |||
1279 | { | 1279 | { |
1280 | if (!generic_detach_inode(inode)) | 1280 | if (!generic_detach_inode(inode)) |
1281 | return; | 1281 | return; |
1282 | evict(inode, 0); | 1282 | evict(inode); |
1283 | wake_up_inode(inode); | 1283 | wake_up_inode(inode); |
1284 | destroy_inode(inode); | 1284 | destroy_inode(inode); |
1285 | } | 1285 | } |