Skip to contentSkip to conversation

ocfs2 and configfs fixes for 2.6.39-rc

GIT PULL Joel Becker 1 participant 1 message May 18, 2011 OCFS2

lore
Share & tools
lore

Joel Becker

author maintainer
#0 lore raw

Linus et al,
Here are the last ocfs2 and configfs fixes for 2.6.39-rc.
These include a configfs crash and a compatibility regression in the ocfs2 internal DLM.
Please pull.

The following changes since commit 446cc6345d3de6571bdd0840f48aca441488a28d:

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (2011-05-12 18:00:09 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git fixes

Joel Becker (2):
configfs: Don't try to d_delete() negative dentries.
configfs: Fix race between configfs_readdir() and configfs_d_iput()

Marcus Meissner (1):
ocfs2: Initialize data_ac (might be used uninitialized)

Sunil Mushran (5):
ocfs2/dlm: Use negotiated o2dlm protocol version ocfs2/cluster: Increase the live threshold for global heartbeat ocfs2/cluster: Heartbeat mismatch message improved
ocfs2: Skip mount recovery for hard-ro mounts
ocfs2/dlm: Target node death during resource migration leads to thread spin

Tristan Ye (1):
ocfs2: skip existing hole when removing the last extent_rec in punching-hole codes.

 fs/configfs/dir.c            |   39 ++++++++++++++++++++++-----
 fs/ocfs2/cluster/heartbeat.c |   61 +++++++++++++++++++++++++++++------------
 fs/ocfs2/dir.c               |    2 +-
 fs/ocfs2/dlm/dlmdomain.c     |    3 +-
 fs/ocfs2/dlm/dlmmaster.c     |    3 ++
 fs/ocfs2/file.c              |   12 ++++++++
 fs/ocfs2/journal.c           |    3 ++
 7 files changed, 96 insertions(+), 27 deletions(-)