diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-12-17 09:24:49 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-12-27 11:38:38 -0500 |
| commit | c5a6835a6098453582aadde2b4b04d98440c51f2 (patch) | |
| tree | c2a5e8324927d4126453e06f14a71ede57bf6c3d | |
| parent | 162845a4a92ddd95ef155c5b1709bd06d123e169 (diff) | |
bcachefs: Fix duplicate ioctl nr
| -rw-r--r-- | fs/bcachefs/bcachefs_ioctl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/bcachefs/bcachefs_ioctl.h b/fs/bcachefs/bcachefs_ioctl.h index 7da11762fffe..fb595dffbcc3 100644 --- a/fs/bcachefs/bcachefs_ioctl.h +++ b/fs/bcachefs/bcachefs_ioctl.h @@ -70,7 +70,11 @@ struct bch_ioctl_incremental { #define BCH_IOCTL_USAGE _IOWR(0xbc, 11, struct bch_ioctl_usage) #define BCH_IOCTL_READ_SUPER _IOW(0xbc, 12, struct bch_ioctl_read_super) #define BCH_IOCTL_DISK_GET_IDX _IOW(0xbc, 13, struct bch_ioctl_disk_get_idx) -#define BCH_IOCTL_DISK_RESIZE _IOW(0xbc, 13, struct bch_ioctl_disk_resize) +#define BCH_IOCTL_DISK_RESIZE _IOW(0xbc, 14, struct bch_ioctl_disk_resize) + +/* ioctl below act on a particular file, not the filesystem as a whole: */ + +#define BCHFS_IOC_REINHERIT_ATTRS _IOR(0xbc, 64, const char __user *) /* * BCH_IOCTL_QUERY_UUID: get filesystem UUID @@ -306,6 +310,4 @@ struct bch_ioctl_disk_resize { __u64 nbuckets; }; -#define BCHFS_IOC_REINHERIT_ATTRS _IOR(0xbc, 14, const char __user *) - #endif /* _BCACHEFS_IOCTL_H */ |