diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-04 19:52:12 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:47 -0400 |
| commit | 2bbbda308f5ca027d4fd721f914c0cab88d49aec (patch) | |
| tree | 07c10b18c4902cde59a991c6f999a630735e1720 | |
| parent | be7ce4161f9e6bf2497f90337d1214aa6ee06e15 (diff) | |
| download | linux-3.10-2bbbda308f5ca027d4fd721f914c0cab88d49aec.tar.gz linux-3.10-2bbbda308f5ca027d4fd721f914c0cab88d49aec.tar.bz2 linux-3.10-2bbbda308f5ca027d4fd721f914c0cab88d49aec.zip | |
switch hugetlbfs to ->evict_inode()
The first spoils - hugetlb can use default ->drop_inode() now.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/hugetlbfs/inode.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index d5f019d48b0..bf1a2f400e7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -371,29 +371,12 @@ static void truncate_hugepages(struct inode *inode, loff_t lstart) hugetlb_unreserve_pages(inode, start, freed); } -static void hugetlbfs_delete_inode(struct inode *inode) +static void hugetlbfs_evict_inode(struct inode *inode) { truncate_hugepages(inode, 0); clear_inode(inode); } -static void hugetlbfs_forget_inode(struct inode *inode) __releases(inode_lock) -{ - if (generic_detach_inode(inode)) { - truncate_hugepages(inode, 0); - clear_inode(inode); - destroy_inode(inode); - } -} - -static void hugetlbfs_drop_inode(struct inode *inode) -{ - if (!inode->i_nlink) - generic_delete_inode(inode); - else - hugetlbfs_forget_inode(inode); -} - static inline void hugetlb_vmtruncate_list(struct prio_tree_root *root, pgoff_t pgoff) { @@ -713,9 +696,8 @@ static const struct inode_operations hugetlbfs_inode_operations = { static const struct super_operations hugetlbfs_ops = { .alloc_inode = hugetlbfs_alloc_inode, .destroy_inode = hugetlbfs_destroy_inode, + .evict_inode = hugetlbfs_evict_inode, .statfs = hugetlbfs_statfs, - .delete_inode = hugetlbfs_delete_inode, - .drop_inode = hugetlbfs_drop_inode, .put_super = hugetlbfs_put_super, .show_options = generic_show_options, }; |