From 19b505a93434500469d9e2726967f28685f777a3 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 17 Dec 2018 09:24:49 -0500 Subject: bcachefs: Fix duplicate ioctl nr Signed-off-by: Kent Overstreet --- fs/bcachefs/bcachefs_ioctl.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fs/bcachefs/bcachefs_ioctl.h') diff --git a/fs/bcachefs/bcachefs_ioctl.h b/fs/bcachefs/bcachefs_ioctl.h index 2dca4bb0362b..8c0599618404 100644 --- a/fs/bcachefs/bcachefs_ioctl.h +++ b/fs/bcachefs/bcachefs_ioctl.h @@ -71,7 +71,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 @@ -307,6 +311,4 @@ struct bch_ioctl_disk_resize { __u64 nbuckets; }; -#define BCHFS_IOC_REINHERIT_ATTRS _IOR(0xbc, 14, const char __user *) - #endif /* _BCACHEFS_IOCTL_H */ -- cgit v1.2.3