Pull btrfs updates from Chris Mason: "This has fixes and cleanups Dave Sterba collected for the merge window. The biggest functional fixes are between btrfs raid5/6 and scrub, and raid5/6 and device replacement. Some of our pending qgroup fixes are included as well while I bash on the rest in testing. We also have the usual set of cleanups, including one that makes __btrfs_map_block() much more maintainable, and conversions from atomic_t to refcount_t" * 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (71 commits) btrfs: fix the gfp_mask for the reada_zones radix tree Btrfs: fix reported number of inode blocks Btrfs: send, fix file hole not being preserved due to inline extent Btrfs: fix extent map leak during fallocate error path Btrfs: fix incorrect space accounting after failure to insert inline extent Btrfs: fix invalid attempt to free reserved space on failure to cow range btrfs: Handle delalloc error correctly to avoid ordered extent hang btrfs: Fix metadata underflow caused by btrfs_reloc_clone_csum error btrfs: check if the device is flush capable btrfs: delete unused member nobarriers btrfs: scrub: Fix RAID56 recovery race condition btrfs: scrub: Introduce full stripe lock for RAID56 btrfs: Use ktime_get_real_ts for root ctime Btrfs: handle only applicable errors returned by btrfs_get_extent btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option btrfs: use q which is already obtained from bdev_get_queue Btrfs: switch to div64_u64 if with a u64 divisor Btrfs: update scrub_parity to use u64 stripe_len Btrfs: enable repair during read for raid56 profile btrfs: use clear_page where appropriate ...
Showing the changes to include/uapi/linux (1 of 40 files). Show all
Unified · Split
| @@ -291,10 +291,10 @@ struct btrfs_ioctl_feature_flags { · 290 unmodified lines | |||
| 291 | struct btrfs_balance_args { | 291 | struct btrfs_balance_args { |
| 292 | __u64 profiles; | 292 | __u64 profiles; |
| 293 | union { | 293 | union { |
| 294 | __le64 usage; | 294 | __u64 usage; |
| 295 | struct { | 295 | struct { |
| 296 | __le32 usage_min; | 296 | __u32 usage_min; |
| 297 | __le32 usage_max; | 297 | __u32 usage_max; |
| 298 | }; | 298 | }; |
| 299 | }; | 299 | }; |
| 300 | __u64 devid; | 300 | __u64 devid; |
| @@ -324,8 +324,8 @@ struct btrfs_balance_args { · 23 unmodified lines | |||
| 324 | * Process chunks that cross stripes_min..stripes_max devices, | 324 | * Process chunks that cross stripes_min..stripes_max devices, |
| 325 | * BTRFS_BALANCE_ARGS_STRIPES_RANGE | 325 | * BTRFS_BALANCE_ARGS_STRIPES_RANGE |
| 326 | */ | 326 | */ |
| 327 | __le32 stripes_min; | 327 | __u32 stripes_min; |
| 328 | __le32 stripes_max; | 328 | __u32 stripes_max; |
| 329 | 329 | ||
| 330 | __u64 unused[6]; | 330 | __u64 unused[6]; |
| 331 | } __attribute__ ((__packed__)); | 331 | } __attribute__ ((__packed__)); |