Skip to content

Commit 445cb12

Browse files
AstralBobAndreas Gruenbacher
authored andcommitted
Revert "GFS2: free disk inode which is deleted by remote node -V2"
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 <[email protected]> Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent b88beb9 commit 445cb12

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

fs/gfs2/dentry.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,26 +83,8 @@ static int gfs2_dhash(const struct dentry *dentry, struct qstr *str)
8383
return 0;
8484
}
8585

86-
static int gfs2_dentry_delete(const struct dentry *dentry)
87-
{
88-
struct gfs2_inode *ginode;
89-
90-
if (d_really_is_negative(dentry))
91-
return 0;
92-
93-
ginode = GFS2_I(d_inode(dentry));
94-
if (!gfs2_holder_initialized(&ginode->i_iopen_gh))
95-
return 0;
96-
97-
if (test_bit(GLF_DEMOTE, &ginode->i_iopen_gh.gh_gl->gl_flags))
98-
return 1;
99-
100-
return 0;
101-
}
102-
10386
const struct dentry_operations gfs2_dops = {
10487
.d_revalidate = gfs2_drevalidate,
10588
.d_hash = gfs2_dhash,
106-
.d_delete = gfs2_dentry_delete,
10789
};
10890

0 commit comments

Comments
 (0)