diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-06-05 19:22:50 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:48:00 -0400 |
commit | d3b4f9ae184b0a3982dbe000ddf88952f090dc28 (patch) | |
tree | 0926a5f36cb66772aef2c944221babf3381e5a9b | |
parent | d299eadc098743ea0cfbf9502fb04abf1d39ce36 (diff) |
switch smbfs to evict_inode()
NB: treatment of inode hash is completely braindead there
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/smbfs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index e338f0a5a70d..450c91941988 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | #define SMB_TTL_DEFAULT 1000 | 47 | #define SMB_TTL_DEFAULT 1000 |
48 | 48 | ||
49 | static void smb_delete_inode(struct inode *); | 49 | static void smb_evict_inode(struct inode *); |
50 | static void smb_put_super(struct super_block *); | 50 | static void smb_put_super(struct super_block *); |
51 | static int smb_statfs(struct dentry *, struct kstatfs *); | 51 | static int smb_statfs(struct dentry *, struct kstatfs *); |
52 | static int smb_show_options(struct seq_file *, struct vfsmount *); | 52 | static int smb_show_options(struct seq_file *, struct vfsmount *); |
@@ -102,7 +102,7 @@ static const struct super_operations smb_sops = | |||
102 | .alloc_inode = smb_alloc_inode, | 102 | .alloc_inode = smb_alloc_inode, |
103 | .destroy_inode = smb_destroy_inode, | 103 | .destroy_inode = smb_destroy_inode, |
104 | .drop_inode = generic_delete_inode, | 104 | .drop_inode = generic_delete_inode, |
105 | .delete_inode = smb_delete_inode, | 105 | .evict_inode = smb_evict_inode, |
106 | .put_super = smb_put_super, | 106 | .put_super = smb_put_super, |
107 | .statfs = smb_statfs, | 107 | .statfs = smb_statfs, |
108 | .show_options = smb_show_options, | 108 | .show_options = smb_show_options, |
@@ -324,15 +324,15 @@ out: | |||
324 | * All blocking cleanup operations need to go here to avoid races. | 324 | * All blocking cleanup operations need to go here to avoid races. |
325 | */ | 325 | */ |
326 | static void | 326 | static void |
327 | smb_delete_inode(struct inode *ino) | 327 | smb_evict_inode(struct inode *ino) |
328 | { | 328 | { |
329 | DEBUG1("ino=%ld\n", ino->i_ino); | 329 | DEBUG1("ino=%ld\n", ino->i_ino); |
330 | truncate_inode_pages(&ino->i_data, 0); | 330 | truncate_inode_pages(&ino->i_data, 0); |
331 | end_writeback(ino); | ||
331 | lock_kernel(); | 332 | lock_kernel(); |
332 | if (smb_close(ino)) | 333 | if (smb_close(ino)) |
333 | PARANOIA("could not close inode %ld\n", ino->i_ino); | 334 | PARANOIA("could not close inode %ld\n", ino->i_ino); |
334 | unlock_kernel(); | 335 | unlock_kernel(); |
335 | clear_inode(ino); | ||
336 | } | 336 | } |
337 | 337 | ||
338 | static struct option opts[] = { | 338 | static struct option opts[] = { |