Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus

Conflicts: fs/btrfs/super.c
2026-09-26 18:16:26 +00:00 · 2009-09-24 10:00:58 -04:00 · 2009-09-24 10:00:58 -04:00 · 54bcf382da
commit 54bcf382da
parent 94a8d5caba c65ddb52dc
31 changed files with 2742 additions and 1983 deletions
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
--- a/fs/btrfs/async-thread.h
+++ b/fs/btrfs/async-thread.h
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
--- a/fs/btrfs/orphan.c
+++ b/fs/btrfs/orphan.c
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h