Commit 445cb127 authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher
Browse files

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



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

The original intent behind commit 970343cd 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: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent b88beb9a

fs/gfs2/dentry.c

+0 −18
Original line number Diff line number Diff line
@@ -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,

};