From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Wed, 20 Apr 2011 06:45:49 +0000 (+0000)
Subject: Btrfs: fix unsafe usage of merge_state
X-Git-Tag: v3.0-rc1~38^2~5^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7f895a2b2d1a002810d52e7b6653c9dc2fd0b0b;p=pandora-kernel.git

Btrfs: fix unsafe usage of merge_state

merge_state can free the current state if it can be merged with the next node,
but in set_extent_bit(), after merge_state, we still use the current extent to
get the next node and cache it into cached_state

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

Reading git-diff-tree failed