From: Luka Perkov <luka@openwrt.org>
To: linux-mtd@lists.infradead.org
Cc: luka@openwrt.org, Artem Bityutskiy <dedekind1@gmail.com>,
John Crispin <blogic@openwrt.org>
Subject: [PATCH] UBI: add a ubi forced detach ioctl
Date: Mon, 12 May 2014 01:17:30 +0200 [thread overview]
Message-ID: <1399850250-24616-1-git-send-email-luka@openwrt.org> (raw)
From: John Crispin <blogic@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Tested-by: Luka Perkov <luka@openwrt.org>
CC: Artem Bityutskiy <dedekind1@gmail.com>
---
drivers/mtd/ubi/cdev.c | 7 +++++--
include/uapi/mtd/ubi-user.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index f54562a..dce1171 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -970,7 +970,7 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd,
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))
@@ -1020,6 +1020,9 @@ static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd,
}
/* Detach an MTD device command */
+ case UBI_IOCFDET:
+ force = 1;
+ /* fallthrough */
case UBI_IOCDET:
{
int ubi_num;
@@ -1032,7 +1035,7 @@ static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd,
}
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;
}
diff --git a/include/uapi/mtd/ubi-user.h b/include/uapi/mtd/ubi-user.h
index 1927b0d..7600e18 100644
--- a/include/uapi/mtd/ubi-user.h
+++ b/include/uapi/mtd/ubi-user.h
@@ -178,6 +178,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, 66, __s32)
/* ioctl commands of UBI volume character devices */
--
1.9.2
next reply other threads:[~2014-05-11 23:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-11 23:17 Luka Perkov [this message]
2014-05-12 7:14 ` [PATCH] UBI: add a ubi forced detach ioctl Richard Weinberger
2014-05-12 9:21 ` John Crispin
2014-05-12 10:44 ` Luka Perkov
2014-05-12 13:47 ` Richard Weinberger
2014-05-12 14:30 ` Luka Perkov
2014-05-13 9:03 ` Artem Bityutskiy
2014-05-13 9:09 ` John Crispin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399850250-24616-1-git-send-email-luka@openwrt.org \
--to=luka@openwrt.org \
--cc=blogic@openwrt.org \
--cc=dedekind1@gmail.com \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox