ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-29 18:19:02 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

kernel: drop now unused ubi forced detach patch

Browse Source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41272
This commit is contained in:
John Crispin 2014-06-19 14:13:12 +00:00
parent 9284956ad8
commit 0d5a6fd819
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
target/linux/generic/patches-3.10/413-mtd-ubi-forced-detach.patch
View File

@ -1,41 +0,0 @@
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -974,7 +974,7 @@ static long ubi_cdev_ioctl(struct file *
static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
- int err = 0;
+ int err = 0, force = 0;
void __user *argp = (void __user *)arg;
if (!capable(CAP_SYS_RESOURCE))
@@ -1024,6 +1024,10 @@ static long ctrl_cdev_ioctl(struct file
}
/* Detach an MTD device command */
+ case UBI_IOCFDET:
+ force = 1;
+ /* no break */
+
case UBI_IOCDET:
{
int ubi_num;
@@ -1036,7 +1040,7 @@ static long ctrl_cdev_ioctl(struct file
}
mutex_lock(&ubi_devices_mutex);
- err = ubi_detach_mtd_dev(ubi_num, 0);
+ err = ubi_detach_mtd_dev(ubi_num, force);
mutex_unlock(&ubi_devices_mutex);
break;
}
--- a/include/uapi/mtd/ubi-user.h
+++ b/include/uapi/mtd/ubi-user.h
@@ -168,6 +168,7 @@
#define UBI_IOCATT _IOW(UBI_CTRL_IOC_MAGIC, 64, struct ubi_attach_req)
/* Detach an MTD device */
#define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, __s32)
+#define UBI_IOCFDET _IOW(UBI_CTRL_IOC_MAGIC, 99, __s32)
/* ioctl commands of UBI volume character devices */