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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (58 commits) Btrfs: use the device_list_mutex during write_dev_supers Btrfs: setup free ino caching in a more asynchronous way btrfs scrub: don't coalesce pages that are logically discontiguous Btrfs: return -ENOMEM in clear_extent_bit Btrfs: add mount -o auto_defrag Btrfs: using rcu lock in the reader side of devices list Btrfs: drop unnecessary device lock Btrfs: fix the race between remove dev and alloc chunk Btrfs: fix the race between reading and updating devices Btrfs: fix bh leak on __btrfs_open_devices path Btrfs: fix unsafe usage of merge_state Btrfs: allocate extent state and check the result properly fs/btrfs: Add missing btrfs_free_path Btrfs: check return value of btrfs_inc_extent_ref() Btrfs: return error to caller if read_one_inode() fails Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item Btrfs: return error code to caller when btrfs_del_item fails Btrfs: return error code to caller when btrfs_previous_item fails btrfs: fix typo 'testeing' -> 'testing' btrfs: typo: 'btrfS' -> 'btrfs' ...
2026-10-14 05:55:17 +00:00 · 2011-05-27 13:57:12 -07:00 · 2011-05-27 13:57:12 -07:00 · a0c3061093
commit a0c3061093
parent 10799db60c 174ba50915
48 changed files with 6594 additions and 4670 deletions
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
--- 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/compression.h
+++ b/fs/btrfs/compression.h
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.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/disk-io.h
+++ b/fs/btrfs/disk-io.h
--- 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-item.c
+++ b/fs/btrfs/file-item.c
--- 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/free-space-cache.h
+++ b/fs/btrfs/free-space-cache.h
--- 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-map.h
+++ b/fs/btrfs/inode-map.h
--- 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/locking.c
+++ b/fs/btrfs/locking.c
--- a/fs/btrfs/locking.h
+++ b/fs/btrfs/locking.h
--- a/fs/btrfs/ref-cache.c
+++ b/fs/btrfs/ref-cache.c
--- a/fs/btrfs/ref-cache.h
+++ b/fs/btrfs/ref-cache.h
--- 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/scrub.c
+++ b/fs/btrfs/scrub.c
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
--- a/fs/btrfs/tree-defrag.c
+++ b/fs/btrfs/tree-defrag.c
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
--- a/fs/btrfs/version.sh
+++ b/fs/btrfs/version.sh
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c