git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74b1b10 ebdc416)
gfs2: Merge branch 'for-next.nopid' into for-next
authorAndreas Gruenbacher <agruenba@redhat.com>
Sun, 9 Oct 2022 20:56:28 +0000 (22:56 +0200)
committerAndreas Gruenbacher <agruenba@redhat.com>
Sun, 9 Oct 2022 20:56:28 +0000 (22:56 +0200)
commitc7d7d2d345697eb3781198e58a22504feb74af63
tree66bf10cf2aeceea847adf863d616f545526edb74tree
parent74b1b10e29b1f25e1a081fa82733baea65429d53commit | diff
parentebdc416c9c0bed245d6cda92ae2a98483e513051commit | diff
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>
fs/gfs2/file.c diff1 | diff2 | blob | history
fs/gfs2/glock.c diff1 | diff2 | blob | history
fs/gfs2/glock.h diff1 | diff2 | blob | history
fs/gfs2/inode.c diff1 | diff2 | blob | history
fs/gfs2/ops_fstype.c diff1 | diff2 | blob | history
fs/gfs2/super.c diff1 | diff2 | blob | history
fs/gfs2/util.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.