diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-07 00:45:56 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:48:20 -0400 |
commit | 94ee8494ac84606f06d522a2c016d40aabffb378 (patch) | |
tree | af19a7f5a2627155b2b49b3cb340c3a71951fa12 /fs/ncpfs | |
parent | 3aac2b62e0f345c8a637cf94dc62e9000de9d8b6 (diff) |
switch ncpfs to ->evict_inode()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ncpfs')
-rw-r--r-- | fs/ncpfs/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index b4e8aaae14be..c0434313f920 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #define NCP_DEFAULT_TIME_OUT 10 | 43 | #define NCP_DEFAULT_TIME_OUT 10 |
44 | #define NCP_DEFAULT_RETRY_COUNT 20 | 44 | #define NCP_DEFAULT_RETRY_COUNT 20 |
45 | 45 | ||
46 | static void ncp_delete_inode(struct inode *); | 46 | static void ncp_evict_inode(struct inode *); |
47 | static void ncp_put_super(struct super_block *); | 47 | static void ncp_put_super(struct super_block *); |
48 | static int ncp_statfs(struct dentry *, struct kstatfs *); | 48 | static int ncp_statfs(struct dentry *, struct kstatfs *); |
49 | static int ncp_show_options(struct seq_file *, struct vfsmount *); | 49 | static int ncp_show_options(struct seq_file *, struct vfsmount *); |
@@ -100,7 +100,7 @@ static const struct super_operations ncp_sops = | |||
100 | .alloc_inode = ncp_alloc_inode, | 100 | .alloc_inode = ncp_alloc_inode, |
101 | .destroy_inode = ncp_destroy_inode, | 101 | .destroy_inode = ncp_destroy_inode, |
102 | .drop_inode = generic_delete_inode, | 102 | .drop_inode = generic_delete_inode, |
103 | .delete_inode = ncp_delete_inode, | 103 | .evict_inode = ncp_evict_inode, |
104 | .put_super = ncp_put_super, | 104 | .put_super = ncp_put_super, |
105 | .statfs = ncp_statfs, | 105 | .statfs = ncp_statfs, |
106 | .remount_fs = ncp_remount, | 106 | .remount_fs = ncp_remount, |
@@ -282,19 +282,19 @@ ncp_iget(struct super_block *sb, struct ncp_entry_info *info) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | static void | 284 | static void |
285 | ncp_delete_inode(struct inode *inode) | 285 | ncp_evict_inode(struct inode *inode) |
286 | { | 286 | { |
287 | truncate_inode_pages(&inode->i_data, 0); | 287 | truncate_inode_pages(&inode->i_data, 0); |
288 | end_writeback(inode); | ||
288 | 289 | ||
289 | if (S_ISDIR(inode->i_mode)) { | 290 | if (S_ISDIR(inode->i_mode)) { |
290 | DDPRINTK("ncp_delete_inode: put directory %ld\n", inode->i_ino); | 291 | DDPRINTK("ncp_evict_inode: put directory %ld\n", inode->i_ino); |
291 | } | 292 | } |
292 | 293 | ||
293 | if (ncp_make_closed(inode) != 0) { | 294 | if (ncp_make_closed(inode) != 0) { |
294 | /* We can't do anything but complain. */ | 295 | /* We can't do anything but complain. */ |
295 | printk(KERN_ERR "ncp_delete_inode: could not close\n"); | 296 | printk(KERN_ERR "ncp_evict_inode: could not close\n"); |
296 | } | 297 | } |
297 | clear_inode(inode); | ||
298 | } | 298 | } |
299 | 299 | ||
300 | static void ncp_stop_tasks(struct ncp_server *server) { | 300 | static void ncp_stop_tasks(struct ncp_server *server) { |