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>

diff --cc fs/gfs2/file.c
Simple merge

diff --cc fs/gfs2/glock.c
Simple merge

diff --cc fs/gfs2/glock.h
Simple merge

diff --cc fs/gfs2/inode.c
index 56ded979988cac324a8a17e2ee06755bc327cee5,e211ed8636b5b1e525a7b7f2741130ee494aca20..04a201584fa7c70d6403257f2ef17e282d86827d
--- 1/fs/gfs2/inode.c
--- 2/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))

diff --cc fs/gfs2/ops_fstype.c
Simple merge

diff --cc fs/gfs2/super.c
Simple merge

diff --cc fs/gfs2/util.c
Simple merge