Btrfs: merge on the way down during deletes
authorChris Mason <chris.mason@oracle.com>
Thu, 1 Mar 2007 17:04:21 +0000 (12:04 -0500)
committerDavid Woodhouse <dwmw2@hera.kernel.org>
Thu, 1 Mar 2007 17:04:21 +0000 (12:04 -0500)
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.c

Simple merge