Btrfs: Add back the online defragging code
authorChris Mason <chris.mason@oracle.com>
Mon, 15 Oct 2007 20:17:34 +0000 (16:17 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 15:03:56 +0000 (11:03 -0400)
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/disk-io.h
fs/btrfs/extent-tree.c
fs/btrfs/extent_map.h
fs/btrfs/transaction.c
fs/btrfs/tree-defrag.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge