diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2014-03-05 12:01:56 +0100 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2014-03-05 14:49:15 +0100 |
| commit | 8af871887fcba470ff9265c65cff7d14d9e0e3f9 (patch) | |
| tree | 7bd29431422649a5c241b72a746150af10bb76ca | |
| parent | UBI: block: Use ENOSYS as return value when CONFIG_UBIBLOCK=n (diff) | |
| download | linux-8af871887fcba470ff9265c65cff7d14d9e0e3f9.tar.xz linux-8af871887fcba470ff9265c65cff7d14d9e0e3f9.zip | |
UBI: rename block device ioctls
Rename the UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK to UBI_IOCVOLCRBLK and
UBI_IOCVOLRMBLK, because we do not use terms "attach" and "detach" for the R/O
block devices on top of UBI volumes. Instead, we use terms "create" and
"remove". This patch also amends the related commentaries.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
| -rw-r--r-- | drivers/mtd/ubi/block.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/ubi/cdev.c | 8 | ||||
| -rw-r--r-- | include/uapi/mtd/ubi-user.h | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index 16e67318acf3..69a74fd07978 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -32,7 +32,7 @@ * This feature is compiled in the UBI core, and adds a 'block' parameter * to allow early creation of block devices on top of UBI volumes. Runtime * block creation/removal for UBI volumes is provided through two UBI ioctls: - * UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK. + * UBI_IOCVOLCRBLK and UBI_IOCVOLRMBLK. */ #include <linux/module.h> diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index 11c847349642..f54562a5998e 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, break; } - /* Attach a block device to an UBI volume */ - case UBI_IOCVOLATTBLK: + /* Create a R/O block device on top of the UBI volume */ + case UBI_IOCVOLCRBLK: { struct ubi_volume_info vi; @@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, break; } - /* Dettach a block device from an UBI volume */ - case UBI_IOCVOLDETBLK: + /* Remove the R/O block device */ + case UBI_IOCVOLRMBLK: { struct ubi_volume_info vi; diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h index b98585ad3346..9c885e26cc0f 100644 --- a/include/uapi/mtd/ubi-user.h +++ b/include/uapi/mtd/ubi-user.h @@ -138,9 +138,9 @@ * Block devices on UBI volumes * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * To attach or detach a block device from an UBI volume the %UBI_IOCVOLATTBLK - * and %UBI_IOCVOLDETBLK ioctl commands should be used, respectively. - * These commands take no arguments. + * To create or remove a R/O block device on top of an UBI volume the + * %UBI_IOCVOLCRBLK and %UBI_IOCVOLRMBLK ioctl commands should be used, + * respectively. These commands take no arguments. */ /* @@ -198,10 +198,10 @@ /* Set an UBI volume property */ #define UBI_IOCSETVOLPROP _IOW(UBI_VOL_IOC_MAGIC, 6, \ struct ubi_set_vol_prop_req) -/* Attach a block device to an UBI volume */ -#define UBI_IOCVOLATTBLK _IO(UBI_VOL_IOC_MAGIC, 7) -/* Detach a block device from an UBI volume */ -#define UBI_IOCVOLDETBLK _IO(UBI_VOL_IOC_MAGIC, 8) +/* Create a R/O block device on top of an UBI volume */ +#define UBI_IOCVOLCRBLK _IO(UBI_VOL_IOC_MAGIC, 7) +/* Remove the R/O block device */ +#define UBI_IOCVOLRMBLK _IO(UBI_VOL_IOC_MAGIC, 8) /* Maximum MTD device name length supported by UBI */ #define MAX_UBI_MTD_NAME_LEN 127 |