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: (25 commits) Btrfs: forced readonly mounts on errors btrfs: Require CAP_SYS_ADMIN for filesystem rebalance Btrfs: don't warn if we get ENOSPC in btrfs_block_rsv_check btrfs: Fix memory leak in btrfs_read_fs_root_no_radix() btrfs: check NULL or not btrfs: Don't pass NULL ptr to func that may deref it. btrfs: mount failure return value fix btrfs: Mem leak in btrfs_get_acl() btrfs: fix wrong free space information of btrfs btrfs: make the chunk allocator utilize the devices better btrfs: restructure find_free_dev_extent() btrfs: fix wrong calculation of stripe size btrfs: try to reclaim some space when chunk allocation fails btrfs: fix wrong data space statistics fs/btrfs: Fix build of ctree Btrfs: fix off by one while setting block groups readonly Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctls Btrfs: Add readonly snapshots support Btrfs: Refactor btrfs_ioctl_snap_create() btrfs: Extract duplicate decompress code ...
Showing
- fs/btrfs/Kconfig 2 additions, 0 deletionsfs/btrfs/Kconfig
- fs/btrfs/Makefile 1 addition, 1 deletionfs/btrfs/Makefile
- fs/btrfs/acl.c 3 additions, 1 deletionfs/btrfs/acl.c
- fs/btrfs/btrfs_inode.h 1 addition, 1 deletionfs/btrfs/btrfs_inode.h
- fs/btrfs/compression.c 324 additions, 5 deletionsfs/btrfs/compression.c
- fs/btrfs/compression.h 54 additions, 18 deletionsfs/btrfs/compression.h
- fs/btrfs/ctree.c 8 additions, 0 deletionsfs/btrfs/ctree.c
- fs/btrfs/ctree.h 43 additions, 5 deletionsfs/btrfs/ctree.h
- fs/btrfs/disk-io.c 405 additions, 7 deletionsfs/btrfs/disk-io.c
- fs/btrfs/disk-io.h 1 addition, 0 deletionsfs/btrfs/disk-io.h
- fs/btrfs/extent-tree.c 79 additions, 11 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.c 6 additions, 1 deletionfs/btrfs/extent_io.c
- fs/btrfs/extent_io.h 16 additions, 1 deletionfs/btrfs/extent_io.h
- fs/btrfs/extent_map.c 2 additions, 0 deletionsfs/btrfs/extent_map.c
- fs/btrfs/extent_map.h 2 additions, 1 deletionfs/btrfs/extent_map.h
- fs/btrfs/file.c 13 additions, 0 deletionsfs/btrfs/file.c
- fs/btrfs/inode.c 59 additions, 31 deletionsfs/btrfs/inode.c
- fs/btrfs/ioctl.c 169 additions, 51 deletionsfs/btrfs/ioctl.c
- fs/btrfs/ioctl.h 11 additions, 1 deletionfs/btrfs/ioctl.h
- fs/btrfs/lzo.c 420 additions, 0 deletionsfs/btrfs/lzo.c
Loading
Please register or sign in to comment