Revert "GFS2: free disk inode which is deleted by remote node -V2"

This reverts commit 970343cd4904 ("GFS2: free disk inode which is
deleted by remote node -V2").

The original intent behind commit 970343cd49 was to cull dentries when a
remote node requests to demote an iopen glock, which happens when the
remote node tries to delete the inode.  This is now handled by
gfs2_try_evict(), which is called via iopen_go_callback() ->
gfs2_queue_try_to_evict().

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/dentry.c b/fs/gfs2/dentry.c
index 2e215e8c3c88e57d6ed17ba6cc5cb22420e99af6..6fe9ca253b709e8b8c193ab9a038206cd1f6c069 100644 (file)
--- a/fs/gfs2/dentry.c
+++ b/fs/gfs2/dentry.c
@@ -83,26 +83,8 @@ static int gfs2_dhash(const struct dentry *dentry, struct qstr *str)
        return 0;
 }
 
-static int gfs2_dentry_delete(const struct dentry *dentry)
-{
-       struct gfs2_inode *ginode;
-
-       if (d_really_is_negative(dentry))
-               return 0;
-
-       ginode = GFS2_I(d_inode(dentry));
-       if (!gfs2_holder_initialized(&ginode->i_iopen_gh))
-               return 0;
-
-       if (test_bit(GLF_DEMOTE, &ginode->i_iopen_gh.gh_gl->gl_flags))
-               return 1;
-
-       return 0;
-}
-
 const struct dentry_operations gfs2_dops = {
        .d_revalidate = gfs2_drevalidate,
        .d_hash = gfs2_dhash,
-       .d_delete = gfs2_dentry_delete,
 };