Skip to content

Commit

Permalink
Revert "GFS2: free disk inode which is deleted by remote node -V2"
Browse files Browse the repository at this point in the history
This reverts commit 970343c ("GFS2: free disk inode which is
deleted by remote node -V2").

The original intent behind commit 970343c 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>
  • Loading branch information
AstralBob authored and Andreas Gruenbacher committed Jan 31, 2023
1 parent b88beb9 commit 445cb12
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions fs/gfs2/dentry.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

0 comments on commit 445cb12

Please sign in to comment.