aboutsummaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-05 19:10:41 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:47:59 -0400
commit1f895f75dc0881592ef21488aac36cfb2b6ca1e3 (patch)
tree2e9adf43b351cadbff41833289619921b8f1f723 /mm/shmem.c
parent6d8af64c1c5ad4fd119b371ae70c114ee1f443b1 (diff)
switch shmem.c to ->evice_inode()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 33222ba256fb..1529d8fdc23f 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -820,7 +820,7 @@ static int shmem_notify_change(struct dentry *dentry, struct iattr *attr)
820 return error; 820 return error;
821} 821}
822 822
823static void shmem_delete_inode(struct inode *inode) 823static void shmem_evict_inode(struct inode *inode)
824{ 824{
825 struct shmem_inode_info *info = SHMEM_I(inode); 825 struct shmem_inode_info *info = SHMEM_I(inode);
826 826
@@ -837,7 +837,7 @@ static void shmem_delete_inode(struct inode *inode)
837 } 837 }
838 BUG_ON(inode->i_blocks); 838 BUG_ON(inode->i_blocks);
839 shmem_free_inode(inode->i_sb); 839 shmem_free_inode(inode->i_sb);
840 clear_inode(inode); 840 end_writeback(inode);
841} 841}
842 842
843static inline int shmem_find_swp(swp_entry_t entry, swp_entry_t *dir, swp_entry_t *edir) 843static inline int shmem_find_swp(swp_entry_t entry, swp_entry_t *dir, swp_entry_t *edir)
@@ -934,7 +934,7 @@ found:
934 934
935 /* 935 /*
936 * Move _head_ to start search for next from here. 936 * Move _head_ to start search for next from here.
937 * But be careful: shmem_delete_inode checks list_empty without taking 937 * But be careful: shmem_evict_inode checks list_empty without taking
938 * mutex, and there's an instant in list_move_tail when info->swaplist 938 * mutex, and there's an instant in list_move_tail when info->swaplist
939 * would appear empty, if it were the only one on shmem_swaplist. We 939 * would appear empty, if it were the only one on shmem_swaplist. We
940 * could avoid doing it if inode NULL; or use this minor optimization. 940 * could avoid doing it if inode NULL; or use this minor optimization.
@@ -2497,7 +2497,7 @@ static const struct super_operations shmem_ops = {
2497 .remount_fs = shmem_remount_fs, 2497 .remount_fs = shmem_remount_fs,
2498 .show_options = shmem_show_options, 2498 .show_options = shmem_show_options,
2499#endif 2499#endif
2500 .delete_inode = shmem_delete_inode, 2500 .evict_inode = shmem_evict_inode,
2501 .drop_inode = generic_delete_inode, 2501 .drop_inode = generic_delete_inode,
2502 .put_super = shmem_put_super, 2502 .put_super = shmem_put_super,
2503}; 2503};