From: Mark Fasheh <mfasheh@suse.com>
Date: Mon, 31 Jan 2011 19:31:04 +0000 (-0800)
Subject: ocfs2: Check heartbeat mode for kernel stacks only
X-Git-Tag: v2.6.37.3~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbb59808e7fca1d4c794a3bfeea7f2046fc25f12;p=pandora-kernel.git

ocfs2: Check heartbeat mode for kernel stacks only

commit 52c303c56c3638944b5f733e3961dc58eb8c7270 upstream.

Commit 2c442719e90a44a6982c033d69df4aae4b167cfa added some checks for proper
heartbeat mode when the o2cb stack is running.  Unfortunately, it didn't
take into account that a userpsace stack could be running. Fix this by only
doing the check if o2cb is in use. This patch allows userspace stacks to
mount the fs again.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed