Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason: "Almost all of these are bug fixes. Dave Sterba's documentation update is the big exception because he removed our promises to set any machine running Btrfs on fire" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Documentation: filesystems: update btrfs tools section Documentation: filesystems: add new btrfs mount options btrfs: update kconfig help text btrfs: fix bio_size_ok() for max_sectors > 0xffff btrfs: Use trace condition for get_extent tracepoint btrfs: fix typo in the log message Btrfs: fix list delete warning when removing ordered root from the list Btrfs: print bytenr instead of page pointer in check-int Btrfs: remove dead codes from ctree.h Btrfs: don't wait for ordered data outside desired range Btrfs: fix lockdep error in async commit Btrfs: avoid heavy operations in btrfs_commit_super Btrfs: fix __btrfs_start_workers retval Btrfs: disable online raid-repair on ro mounts Btrfs: do not inc uncorrectable_errors counter on ro scrubs Btrfs: only drop modified extents if we logged the whole inode Btrfs: make sure to copy everything if we rename Btrfs: don't BUG_ON() if we get an error walking backrefs
No related branches found
No related tags found
Showing
- Documentation/filesystems/btrfs.txt 17 additions, 17 deletionsDocumentation/filesystems/btrfs.txt
- fs/btrfs/Kconfig 10 additions, 5 deletionsfs/btrfs/Kconfig
- fs/btrfs/async-thread.c 1 addition, 0 deletionsfs/btrfs/async-thread.c
- fs/btrfs/check-integrity.c 17 additions, 8 deletionsfs/btrfs/check-integrity.c
- fs/btrfs/ctree.h 0 additions, 6 deletionsfs/btrfs/ctree.h
- fs/btrfs/dev-replace.c 1 addition, 1 deletionfs/btrfs/dev-replace.c
- fs/btrfs/disk-io.c 1 addition, 20 deletionsfs/btrfs/disk-io.c
- fs/btrfs/extent_io.c 8 additions, 3 deletionsfs/btrfs/extent_io.c
- fs/btrfs/inode.c 3 additions, 3 deletionsfs/btrfs/inode.c
- fs/btrfs/ordered-data.c 2 additions, 1 deletionfs/btrfs/ordered-data.c
- fs/btrfs/scrub.c 4 additions, 2 deletionsfs/btrfs/scrub.c
- fs/btrfs/transaction.c 2 additions, 2 deletionsfs/btrfs/transaction.c
- fs/btrfs/tree-log.c 3 additions, 2 deletionsfs/btrfs/tree-log.c
- fs/btrfs/volumes.c 1 addition, 1 deletionfs/btrfs/volumes.c
- include/trace/events/btrfs.h 3 additions, 1 deletioninclude/trace/events/btrfs.h
Loading
Please register or sign in to comment