Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix meta data raid-repair merge problem Btrfs: skip allocation attempt from empty cluster Btrfs: skip block groups without enough space for a cluster Btrfs: start search for new cluster at the beginning Btrfs: reset cluster's max_size when creating bitmap Btrfs: initialize new bitmaps' list Btrfs: fix oops when calling statfs on readonly device Btrfs: Don't error on resizing FS to same size Btrfs: fix deadlock on metadata reservation when evicting a inode Fix URL of btrfs-progs git repository in docs btrfs scrub: handle -ENOMEM from init_ipath()
Showing
- Documentation/filesystems/btrfs.txt 2 additions, 2 deletionsDocumentation/filesystems/btrfs.txt
- fs/btrfs/ctree.h 3 additions, 0 deletionsfs/btrfs/ctree.h
- fs/btrfs/extent-tree.c 23 additions, 11 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.c 20 additions, 7 deletionsfs/btrfs/extent_io.c
- fs/btrfs/free-space-cache.c 2 additions, 0 deletionsfs/btrfs/free-space-cache.c
- fs/btrfs/inode.c 1 addition, 1 deletionfs/btrfs/inode.c
- fs/btrfs/ioctl.c 1 addition, 1 deletionfs/btrfs/ioctl.c
- fs/btrfs/scrub.c 5 additions, 0 deletionsfs/btrfs/scrub.c
- fs/btrfs/super.c 3 additions, 3 deletionsfs/btrfs/super.c
Loading
Please register or sign in to comment