fs: rename generic_delete_inode() and generic_drop_inode()

generic_delete_inode() is rather misleading for what the routine is
doing. inode_just_drop() should be much clearer.

The new naming is inconsistent with generic_drop_inode(), so rename that
one as well with inode_ as the suffix.

No functional changes.

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index 85f590254f07504e9fc7152a3a1abec8d55ef96b..b5db45c0094cac6de312eb2774cd4a3cd399248c 100644 (file)
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -340,8 +340,8 @@ of those. Caller makes sure async writeback cannot be running for the inode whil
 
 ->drop_inode() returns int now; it's called on final iput() with
 inode->i_lock held and it returns true if filesystems wants the inode to be
-dropped.  As before, generic_drop_inode() is still the default and it's been
-updated appropriately.  generic_delete_inode() is also alive and it consists
+dropped.  As before, inode_generic_drop() is still the default and it's been
+updated appropriately.  inode_just_drop() is also alive and it consists
 simply of return 1.  Note that all actual eviction work is done by caller after
 ->drop_inode() returns.
 

diff --git a/Documentation/filesystems/vfs.rst b/Documentation/filesystems/vfs.rst
index 486a9163347478f0fb4c0938dec4cb3509f8afd5..7a314eee6305fd4c7b5f2cbaeddaf13008b01db0 100644 (file)
--- a/Documentation/filesystems/vfs.rst
+++ b/Documentation/filesystems/vfs.rst
@@ -327,11 +327,11 @@ or bottom half).
        inode->i_lock spinlock held.
 
        This method should be either NULL (normal UNIX filesystem
-       semantics) or "generic_delete_inode" (for filesystems that do
+       semantics) or "inode_just_drop" (for filesystems that do
        not want to cache inodes - causing "delete_inode" to always be
        called regardless of the value of i_nlink)
 
-       The "generic_delete_inode()" behavior is equivalent to the old
+       The "inode_just_drop()" behavior is equivalent to the old
        practice of using "force_delete" in the put_inode() case, but
        does not have the races that the "force_delete()" approach had.
 

diff --git a/block/bdev.c b/block/bdev.c
index b77ddd12dc063457c152e62c4779fe704fb228ad..810707cca9703e274affc5a6a1fe0c2bcf169318 100644 (file)
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -412,7 +412,7 @@ static const struct super_operations bdev_sops = {
        .statfs = simple_statfs,
        .alloc_inode = bdev_alloc_inode,
        .free_inode = bdev_free_inode,
-       .drop_inode = generic_delete_inode,
+       .drop_inode = inode_just_drop,
        .evict_inode = bdev_evict_inode,
 };
 

diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 54c480e874cb304f354e6f48a50175c004d0ce1b..d7714d8afb0fa06b37bf94511fbc4f0c8d030587 100644 (file)
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -388,7 +388,7 @@ static const struct super_operations dax_sops = {
        .alloc_inode = dax_alloc_inode,
        .destroy_inode = dax_destroy_inode,
        .free_inode = dax_free_inode,
-       .drop_inode = generic_delete_inode,
+       .drop_inode = inode_just_drop,
 };
 
 static int dax_init_fs_context(struct fs_context *fc)

diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index c44de892a61ec474ba0d642201b73cc045ff5d65..5372ed2a363ecdc5eacad2209bd1313ebd644705 100644 (file)
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -94,7 +94,7 @@ static int ibmasmfs_init_fs_context(struct fs_context *fc)
 
 static const struct super_operations ibmasmfs_s_ops = {
        .statfs         = simple_statfs,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
 };
 
 static const struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations;

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 08a251df20c438e9f44a5391f06ce70eb01a902b..5246fa6af3d61c57f48aea1a51b1233c956aa8bc 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1891,7 +1891,7 @@ static struct dentry *ffs_sb_create_file(struct super_block *sb,
 /* Super block */
 static const struct super_operations ffs_sb_operations = {
        .statfs =       simple_statfs,
-       .drop_inode =   generic_delete_inode,
+       .drop_inode =   inode_just_drop,
 };
 
 struct ffs_sb_fill_data {

diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index b51e132b0cd2a7410450c998878dff911b1f96fe..13c3da49348c5939bfb7829f11a61b60635a5419 100644 (file)
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -2011,7 +2011,7 @@ gadgetfs_create_file (struct super_block *sb, char const *name,
 
 static const struct super_operations gadget_fs_operations = {
        .statfs =       simple_statfs,
-       .drop_inode =   generic_delete_inode,
+       .drop_inode =   inode_just_drop,
 };
 
 static int

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 795c6388744cdb73d6fce6ceb6e5cbb2d87743c8..1581ebac5bb42343e9a49d4314f00791758e633e 100644 (file)
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -252,7 +252,7 @@ static int v9fs_drop_inode(struct inode *inode)
 
        v9ses = v9fs_inode2v9ses(inode);
        if (v9ses->cache & (CACHE_META|CACHE_LOOSE))
-               return generic_drop_inode(inode);
+               return inode_generic_drop(inode);
        /*
         * in case of non cached mode always drop the
         * inode because we want the inode attribute

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index e9538e91f8484d943d70671fb374d34a2dc8f3e5..e1cb17b85791396b09dde58124c2e7ae8dcff620 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -723,9 +723,9 @@ int afs_drop_inode(struct inode *inode)
        _enter("");
 
        if (test_bit(AFS_VNODE_PSEUDODIR, &AFS_FS_I(inode)->flags))
-               return generic_delete_inode(inode);
+               return inode_just_drop(inode);
        else
-               return generic_drop_inode(inode);
+               return inode_generic_drop(inode);
 }
 
 /*

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b77dd22b8cdbe3601028594efadd32e06e83036b..2081654dea5c65739b63d6dd6561363fafda86a1 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7953,7 +7953,7 @@ int btrfs_drop_inode(struct inode *inode)
        if (btrfs_root_refs(&root->root_item) == 0)
                return 1;
        else
-               return generic_drop_inode(inode);
+               return inode_generic_drop(inode);
 }
 
 static void init_once(void *foo)

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index c3eb651862c555254fb3b4818db4c3f7355bfbb4..70dc9467f6a0ec48a1b56ef52db226cd045ba7ed 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1042,7 +1042,7 @@ static const struct super_operations ceph_super_ops = {
        .alloc_inode    = ceph_alloc_inode,
        .free_inode     = ceph_free_inode,
        .write_inode    = ceph_write_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .evict_inode    = ceph_evict_inode,
        .sync_fs        = ceph_sync_fs,
        .put_super      = ceph_put_super,

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index 740f18b60c9d0d0c58584254c58d3f61e8699e07..456c4a2efb53297f3799dbc359d900a9c5afff9d 100644 (file)
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -36,7 +36,7 @@ static void configfs_free_inode(struct inode *inode)
 
 static const struct super_operations configfs_ops = {
        .statfs         = simple_statfs,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .free_inode     = configfs_free_inode,
 };
 

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index c4a139911356896469cbfbdb9c735399a51d811b..6f131910be9dd757e8063a8421aa71304136b497 100644 (file)
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -127,7 +127,7 @@ static int efivarfs_unfreeze_fs(struct super_block *sb);
 
 static const struct super_operations efivarfs_ops = {
        .statfs = efivarfs_statfs,
-       .drop_inode = generic_delete_inode,
+       .drop_inode = inode_just_drop,
        .alloc_inode = efivarfs_alloc_inode,
        .free_inode = efivarfs_free_inode,
        .show_options = efivarfs_show_options,

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index c7d39da7e733b13b2760da3341c8991401043a0b..848e059d58cf1f7ea5bab5e5e8c676e111f1f40a 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1417,7 +1417,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
 
 static int ext4_drop_inode(struct inode *inode)
 {
-       int drop = generic_drop_inode(inode);
+       int drop = inode_generic_drop(inode);
 
        if (!drop)
                drop = fscrypt_drop_inode(inode);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index e16c4e2830c298fc41fc8c12595504888f7b5591..63cf73409da69a7488142e690c58a750416612d8 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1768,7 +1768,7 @@ static int f2fs_drop_inode(struct inode *inode)
                trace_f2fs_drop_inode(inode, 0);
                return 0;
        }
-       ret = generic_drop_inode(inode);
+       ret = inode_generic_drop(inode);
        if (!ret)
                ret = fscrypt_drop_inode(inode);
        trace_f2fs_drop_inode(inode, ret);

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index ecb869e895ab1d644d88868290f4a7dc69e36a2c..63390575b6fd4020ddeeb9b41b7e9661bd3f3814 100644 (file)
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1209,7 +1209,7 @@ static const struct super_operations fuse_super_operations = {
        .free_inode     = fuse_free_inode,
        .evict_inode    = fuse_evict_inode,
        .write_inode    = fuse_write_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .umount_begin   = fuse_umount_begin,
        .statfs         = fuse_statfs,
        .sync_fs        = fuse_sync_fs,

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index b42e2110084b6cf87da3c0fcf92bc329ffcb3621..644b2d1e72769e8be59baa471d5d7e34e4be37a9 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1050,7 +1050,7 @@ static int gfs2_drop_inode(struct inode *inode)
        if (test_bit(SDF_EVICTING, &sdp->sd_flags))
                return 1;
 
-       return generic_drop_inode(inode);
+       return inode_generic_drop(inode);
 }
 
 /**

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 01e516175bcd72b50be30b6f11c65a771147935c..1e1acf5775ab5f6daf13bb917966d05f410d5ff5 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -261,7 +261,7 @@ static int hostfs_show_options(struct seq_file *seq, struct dentry *root)
 static const struct super_operations hostfs_sbops = {
        .alloc_inode    = hostfs_alloc_inode,
        .free_inode     = hostfs_free_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .evict_inode    = hostfs_evict_inode,
        .statfs         = hostfs_statfs,
        .show_options   = hostfs_show_options,

diff --git a/fs/inode.c b/fs/inode.c
index 7b81d4a101b8c7dccda832f1fd974bd634882113..a66c02123bca604d1bcef1f15699b00e390407e5 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1838,11 +1838,11 @@ int insert_inode_locked4(struct inode *inode, unsigned long hashval,
 EXPORT_SYMBOL(insert_inode_locked4);
 
 
-int generic_delete_inode(struct inode *inode)
+int inode_just_drop(struct inode *inode)
 {
        return 1;
 }
-EXPORT_SYMBOL(generic_delete_inode);
+EXPORT_SYMBOL(inode_just_drop);
 
 /*
  * Called when we're dropping the last reference
@@ -1866,7 +1866,7 @@ static void iput_final(struct inode *inode)
        if (op->drop_inode)
                drop = op->drop_inode(inode);
        else
-               drop = generic_drop_inode(inode);
+               drop = inode_generic_drop(inode);
 
        if (!drop &&
            !(inode->i_state & I_DONTCACHE) &&

diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index e384a69fbece7bbd1397f508927c062ef2fbac1c..76eaf64b9d9e084bf9af666d373580359488c355 100644 (file)
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -57,7 +57,7 @@ static int kernfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 
 const struct super_operations kernfs_sops = {
        .statfs         = kernfs_statfs,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .evict_inode    = kernfs_evict_inode,
 
        .show_options   = kernfs_sop_show_options,

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 338ef77ae4230812b198dcce47ffeab5f5b2b40e..cbd8a7f9c6170465222539a42be33b23784a36f1 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -108,7 +108,7 @@ u64 nfs_compat_user_ino64(u64 fileid)
 
 int nfs_drop_inode(struct inode *inode)
 {
-       return NFS_STALE(inode) || generic_drop_inode(inode);
+       return NFS_STALE(inode) || inode_generic_drop(inode);
 }
 EXPORT_SYMBOL_GPL(nfs_drop_inode);
 

diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index 5130ec44e5e158913f09f8d6bf1a01edd4e9df8c..807e2b758a5ce1c3f499cb0c61f6c1e2425f7c07 100644 (file)
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -547,7 +547,7 @@ static const struct super_operations dlmfs_ops = {
        .alloc_inode    = dlmfs_alloc_inode,
        .free_inode     = dlmfs_free_inode,
        .evict_inode    = dlmfs_evict_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
 };
 
 static const struct inode_operations dlmfs_file_inode_operations = {

diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index f3da840758e74224e08a6c81c5e085673f955e1f..b46100a4f5293576549300ae9050430c3f07969b 100644 (file)
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -306,7 +306,7 @@ static const struct super_operations orangefs_s_ops = {
        .free_inode = orangefs_free_inode,
        .destroy_inode = orangefs_destroy_inode,
        .write_inode = orangefs_write_inode,
-       .drop_inode = generic_delete_inode,
+       .drop_inode = inode_just_drop,
        .statfs = orangefs_statfs,
        .show_options = orangefs_show_options,
 };

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index df85a76597e910d00323018f1d2cd720c5db921d..bd3d7ba8fb95b582d7d39d36c69d659b99e7bd52 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -280,7 +280,7 @@ static const struct super_operations ovl_super_operations = {
        .alloc_inode    = ovl_alloc_inode,
        .free_inode     = ovl_free_inode,
        .destroy_inode  = ovl_destroy_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .put_super      = ovl_put_super,
        .sync_fs        = ovl_sync_fs,
        .statfs         = ovl_statfs,

diff --git a/fs/pidfs.c b/fs/pidfs.c
index edc35522d75c49ce0d1fc1f777a77d03ab7855c7..3865272178a863cb1da81931aefa7a8df7a61887 100644 (file)
--- a/fs/pidfs.c
+++ b/fs/pidfs.c
@@ -718,7 +718,7 @@ static void pidfs_evict_inode(struct inode *inode)
 }
 
 static const struct super_operations pidfs_sops = {
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .evict_inode    = pidfs_evict_inode,
        .statfs         = simple_statfs,
 };

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 129490151be147dbdd3667d10fb8b85b62380264..d9b7ef1223437d4412e5a9b961f6481344f92576 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -187,7 +187,7 @@ static int proc_show_options(struct seq_file *seq, struct dentry *root)
 const struct super_operations proc_sops = {
        .alloc_inode    = proc_alloc_inode,
        .free_inode     = proc_free_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .evict_inode    = proc_evict_inode,
        .statfs         = simple_statfs,
        .show_options   = proc_show_options,

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 1a2e1185426ca1ecb68d86fb948767a7fd999b58..b4e55c90f8dc236362da829613709c40938497d5 100644 (file)
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -282,7 +282,7 @@ static int pstore_reconfigure(struct fs_context *fc)
 
 static const struct super_operations pstore_ops = {
        .statfs         = simple_statfs,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .evict_inode    = pstore_evict_inode,
        .show_options   = pstore_show_options,
 };

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index f8874c3b8c1e95b06c83f01a269f7412e9d18895..41f9995da7cab0d11395cb40a98fb4936d52597f 100644 (file)
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -215,7 +215,7 @@ static int ramfs_show_options(struct seq_file *m, struct dentry *root)
 
 static const struct super_operations ramfs_ops = {
        .statfs         = simple_statfs,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .show_options   = ramfs_show_options,
 };
 

diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index 3bd85ab2deb1924412fb726778a48804f0cc5812..b4075385a6493c0a4a0739db5287276814b2ed79 100644 (file)
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -857,7 +857,7 @@ static int cifs_drop_inode(struct inode *inode)
 
        /* no serverino => unconditional eviction */
        return !(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) ||
-               generic_drop_inode(inode);
+               inode_generic_drop(inode);
 }
 
 static const struct super_operations cifs_super_ops = {

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index f3e3b20686085e3b76adac5cff9b5ff3b956c204..733fd1e5a9a2de72f457ac296d47e41765e32ce2 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -335,7 +335,7 @@ static int ubifs_write_inode(struct inode *inode, struct writeback_control *wbc)
 
 static int ubifs_drop_inode(struct inode *inode)
 {
-       int drop = generic_drop_inode(inode);
+       int drop = inode_generic_drop(inode);
 
        if (!drop)
                drop = fscrypt_drop_inode(inode);

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index bb0a82635a770d48a8562b994fe13eb28b922069..a05ff68748dc0949c56f1bcb749c18a385f3ae9d 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -778,7 +778,7 @@ xfs_fs_drop_inode(
                return 0;
        }
 
-       return generic_drop_inode(inode);
+       return inode_generic_drop(inode);
 }
 
 STATIC void

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4daf9b30a64117045eacfde4e80c246682078df8..724b9af67f35a5a850bc217494e8f3640423839e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3312,8 +3312,8 @@ extern void address_space_init_once(struct address_space *mapping);
 extern struct inode * igrab(struct inode *);
 extern ino_t iunique(struct super_block *, ino_t);
 extern int inode_needs_sync(struct inode *inode);
-extern int generic_delete_inode(struct inode *inode);
-static inline int generic_drop_inode(struct inode *inode)
+extern int inode_just_drop(struct inode *inode);
+static inline int inode_generic_drop(struct inode *inode)
 {
        return !inode->i_nlink || inode_unhashed(inode);
 }

diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 5c2e96b19392ae919732674fc7726de07d88ee2e..6d021d18afa6d649c9d313e3afca8833682043d4 100644 (file)
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -788,7 +788,7 @@ static void bpf_free_inode(struct inode *inode)
 
 const struct super_operations bpf_super_ops = {
        .statfs         = simple_statfs,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .show_options   = bpf_show_options,
        .free_inode     = bpf_free_inode,
 };

diff --git a/mm/shmem.c b/mm/shmem.c
index e2c76a30802b6ee3b8cf05a33943fb5583fdc360..932727247c64b2db3172c3a008743f103abc995b 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -5341,7 +5341,7 @@ static const struct super_operations shmem_ops = {
        .get_dquots     = shmem_get_dquots,
 #endif
        .evict_inode    = shmem_evict_inode,
-       .drop_inode     = generic_delete_inode,
+       .drop_inode     = inode_just_drop,
        .put_super      = shmem_put_super,
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
        .nr_cached_objects      = shmem_unused_huge_count,