Commit 1e760fa3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v6.3-rc3-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fix from Andreas Gruenbacher:

 - Reinstate commit 970343cd ("GFS2: free disk inode which is
   deleted by remote node -V2") as reverting that commit could cause
   gfs2_put_super() to hang.

* tag 'gfs2-v6.3-rc3-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  Reinstate "GFS2: free disk inode which is deleted by remote node -V2"
parents 9fd6ba54 260595b4

fs/gfs2/dentry.c

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

};