From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Sun, 9 Oct 2022 20:56:28 +0000 (+0200)
Subject: gfs2: Merge branch 'for-next.nopid' into for-next
X-Git-Tag: v6.1-rc1~63^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c7d7d2d345697eb3781198e58a22504feb74af63;p=linux-block.git

gfs2: Merge branch 'for-next.nopid' into for-next

Resolves a conflict in gfs2_inode_lookup() between the following commits:

    gfs2: Use TRY lock in gfs2_inode_lookup for UNLINKED inodes

    gfs2: Mark the remaining process-independent glock holders as GL_NOPID

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

c7d7d2d345697eb3781198e58a22504feb74af63
diff --cc fs/gfs2/inode.c
index 56ded979988c,e211ed8636b5..04a201584fa7
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@@ -142,12 -141,10 +142,12 @@@ struct inode *gfs2_inode_lookup(struct 
  		if (unlikely(error))
  			goto fail;
  
 -		if (blktype != GFS2_BLKST_UNLINKED)
 +		if (blktype == GFS2_BLKST_UNLINKED)
 +			extra_flags |= LM_FLAG_TRY;
 +		else
  			gfs2_cancel_delete_work(io_gl);
  		error = gfs2_glock_nq_init(io_gl, LM_ST_SHARED,
- 					   GL_EXACT | extra_flags,
 -					   GL_EXACT | GL_NOPID,
++					   GL_EXACT | GL_NOPID | extra_flags,
  					   &ip->i_iopen_gh);
  		gfs2_glock_put(io_gl);
  		if (unlikely(error))