switch sysfs to ->evict_inode()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 7e187fbd3d473d98167ffcf4b4179122c8cceeac..cffb1fd8ba33fdb66aab0c076cf24e3f4f2e6387 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -312,15 +312,15 @@ struct inode * sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd)
  * The sysfs_dirent serves as both an inode and a directory entry for sysfs.
  * To prevent the sysfs inode numbers from being freed prematurely we take a
  * reference to sysfs_dirent from the sysfs inode.  A
- * super_operations.delete_inode() implementation is needed to drop that
+ * super_operations.evict_inode() implementation is needed to drop that
  * reference upon inode destruction.
  */
-void sysfs_delete_inode(struct inode *inode)
+void sysfs_evict_inode(struct inode *inode)
 {
        struct sysfs_dirent *sd  = inode->i_private;
 
        truncate_inode_pages(&inode->i_data, 0);
-       clear_inode(inode);
+       end_writeback(inode);
        sysfs_put(sd);
 }
 

diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 281c0c9bc39f84f85d9ab6f78adc2d93e56a4a40..f2af22574c50978865afc939d6d9a3a853ebdf3c 100644 (file)
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -29,7 +29,7 @@ struct kmem_cache *sysfs_dir_cachep;
 static const struct super_operations sysfs_ops = {
        .statfs         = simple_statfs,
        .drop_inode     = generic_delete_inode,
-       .delete_inode   = sysfs_delete_inode,
+       .evict_inode    = sysfs_evict_inode,
 };
 
 struct sysfs_dirent sysfs_root = {

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 6a13105b55949804a4d582e235df083b645bfe3f..d9be60a2e9561159ced24d2cc545125e26c6ee74 100644 (file)
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -198,7 +198,7 @@ static inline void __sysfs_put(struct sysfs_dirent *sd)
  * inode.c
  */
 struct inode *sysfs_get_inode(struct super_block *sb, struct sysfs_dirent *sd);
-void sysfs_delete_inode(struct inode *inode);
+void sysfs_evict_inode(struct inode *inode);
 int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr *iattr);
 int sysfs_permission(struct inode *inode, int mask);
 int sysfs_setattr(struct dentry *dentry, struct iattr *iattr);