History

Merge branch 'for-4.11/libnvdimm' into for-4.12/dax

Dan Williams committed 9 years ago

Commit bfca9ac2 parents 92a3fa0 11e63f6733 files · +9347 −5710Browse files

Showing the changes to include/uapi/linux (2 of 733 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/btrfs.h +0 −27
  2. include/uapi/linux/packet_diag.h +1 −1
include/uapi/linux/btrfs.h+0−27
@@ -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_PROGRESS714 BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS
715};715};
716/* An error code to error string mapping for the kernel
717* error codes
718*/
719static 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)
include/uapi/linux/packet_diag.h+1−1
@@ -64,7 +64,7 @@ struct packet_diag_mclist { · 63 unmodified lines
64 __u32 pdmc_count;64 __u32 pdmc_count;
65 __u16 pdmc_type;65 __u16 pdmc_type;
66 __u16 pdmc_alen;66 __u16 pdmc_alen;
67 __u8 pdmc_addr[MAX_ADDR_LEN];67 __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */
68};68};
69 69
70struct packet_diag_ring {70struct packet_diag_ring {