UBI: rename block device ioctls

dedekind · dedekind · commit 8af871887fcb · 2014-03-05T15:49:15.000+02:00
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 &lt;artem.bityutskiy@linux.intel.com&gt;
Acked-by: Ezequiel Garcia &lt;ezequiel.garcia@free-electrons.com&gt;
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,`
`561`	`561`	`break;`
`562`	`562`	`}`
`563`	`563`
`564`		`- /* Attach a block device to an UBI volume */`
`565`		`- case UBI_IOCVOLATTBLK:`
	`564`	`+ /* Create a R/O block device on top of the UBI volume */`
	`565`	`+ case UBI_IOCVOLCRBLK:`
`566`	`566`	`{`
`567`	`567`	`struct ubi_volume_info vi;`
`568`	`568`
`@@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,`
`571`	`571`	`break;`
`572`	`572`	`}`
`573`	`573`
`574`		`- /* Dettach a block device from an UBI volume */`
`575`		`- case UBI_IOCVOLDETBLK:`
	`574`	`+ /* Remove the R/O block device */`
	`575`	`+ case UBI_IOCVOLRMBLK:`
`576`	`576`	`{`
`577`	`577`	`struct ubi_volume_info vi;`
`578`	`578`