Pull btrfs fixes from Chris Mason: "Zygo tracked down a very old bug with inline compressed extents. I didn't tag this one for stable because I want to do individual tested backports. It's a little tricky and I'd rather do some extra testing on it along the way" * 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: add missing memset while reading compressed inline extents Btrfs: fix regression in lock_delalloc_pages btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h
Showing the changes to include/uapi/linux (1 of 3 files). Show all
Unified · Split
| @@ -713,33 +713,6 @@ enum btrfs_err_code { · 712 unmodified lines | |||
| 713 | BTRFS_ERROR_DEV_ONLY_WRITABLE, | 713 | BTRFS_ERROR_DEV_ONLY_WRITABLE, |
| 714 | BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS | 714 | BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS |
| 715 | }; | 715 | }; |
| 716 | /* An error code to error string mapping for the kernel | ||
| 717 | * error codes | ||
| 718 | */ | ||
| 719 | static inline char *btrfs_err_str(enum btrfs_err_code err_code) | ||
| 720 | { | ||
| 721 | switch (err_code) { | ||
| 722 | case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: | ||
| 723 | return "unable to go below two devices on raid1"; | ||
| 724 | case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET: | ||
| 725 | return "unable to go below four devices on raid10"; | ||
| 726 | case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: | ||
| 727 | return "unable to go below two devices on raid5"; | ||
| 728 | case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET: | ||
| 729 | return "unable to go below three devices on raid6"; | ||
| 730 | case BTRFS_ERROR_DEV_TGT_REPLACE: | ||
| 731 | return "unable to remove the dev_replace target dev"; | ||
| 732 | case BTRFS_ERROR_DEV_MISSING_NOT_FOUND: | ||
| 733 | return "no missing devices found to remove"; | ||
| 734 | case BTRFS_ERROR_DEV_ONLY_WRITABLE: | ||
| 735 | return "unable to remove the only writeable device"; | ||
| 736 | case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS: | ||
| 737 | return "add/delete/balance/replace/resize operation "\ | ||
| 738 | "in progress"; | ||
| 739 | default: | ||
| 740 | return NULL; | ||
| 741 | } | ||
| 742 | } | ||
| 743 | 716 | ||
| 744 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ | 717 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ |
| 745 | struct btrfs_ioctl_vol_args) | 718 | struct btrfs_ioctl_vol_args) |