Btrfs: transaction rework

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --cc fs/btrfs/Makefile
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/disk-io.h
Simple merge

diff --cc fs/btrfs/super.c
Simple merge

diff --cc fs/btrfs/transaction.c
Simple merge

diff --cc fs/btrfs/transaction.h
Simple merge