Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: configfs: Fix race between configfs_readdir() and configfs_d_iput() configfs: Don't try to d_delete() negative dentries. ocfs2/dlm: Target node death during resource migration leads to thread spin ocfs2: Skip mount recovery for hard-ro mounts ocfs2/cluster: Heartbeat mismatch message improved ocfs2/cluster: Increase the live threshold for global heartbeat ocfs2/dlm: Use negotiated o2dlm protocol version ocfs2: skip existing hole when removing the last extent_rec in punching-hole codes. ocfs2: Initialize data_ac (might be used uninitialized)
Showing
- fs/configfs/dir.c 32 additions, 7 deletionsfs/configfs/dir.c
- fs/ocfs2/cluster/heartbeat.c 43 additions, 18 deletionsfs/ocfs2/cluster/heartbeat.c
- fs/ocfs2/dir.c 1 addition, 1 deletionfs/ocfs2/dir.c
- fs/ocfs2/dlm/dlmdomain.c 2 additions, 1 deletionfs/ocfs2/dlm/dlmdomain.c
- fs/ocfs2/dlm/dlmmaster.c 3 additions, 0 deletionsfs/ocfs2/dlm/dlmmaster.c
- fs/ocfs2/file.c 12 additions, 0 deletionsfs/ocfs2/file.c
- fs/ocfs2/journal.c 3 additions, 0 deletionsfs/ocfs2/journal.c
Loading
Please register or sign in to comment