]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d132c18 08756e2)
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)
commitec152edb16fd1a91c90a7efdca7b025d5448f8f7
tree66bf10cf2aeceea847adf863d616f545526edb74tree | snapshot
parentd132c18da57be759283e39d9ed9761382e1a6012commit | diff
parent08756e2063cefaab0998e0a2359b5cb1d1081f91commit | 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
Linux Kernel Source Tree.