From: Mike Snitzer <snitzer@redhat.com>
Date: Thu, 10 Dec 2009 23:52:35 +0000 (+0000)
Subject: dm snapshot: report merge failure in status
X-Git-Tag: v2.6.33-rc1~75^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8ddb1cfff0070479c1f4a07c1d4a48ef8cb188e;p=pandora-kernel.git

dm snapshot: report merge failure in status

Set 'merge_failed' flag if a snapshot fails to merge.  Update
snapshot_status() to report "Merge failed" if 'merge_failed' is set.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
---

Reading git-diff-tree failed