You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/11/22 16:08:21 UTC
(nuttx) 02/05: rpmsgblk: do not actually unlink blockdevice in rpmsgblk client
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 12d66da8922e4e6ef316c59d1c2bbdc696e47bfa
Author: liaoao <li...@xiaomi.com>
AuthorDate: Wed Nov 1 15:01:02 2023 +0800
rpmsgblk: do not actually unlink blockdevice in rpmsgblk client
rpmsgblk client should not affect the server's use of blockdevice.
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/misc/rpmsgblk.c | 17 +++--------------
drivers/misc/rpmsgblk.h | 1 -
drivers/misc/rpmsgblk_server.c | 24 ------------------------
3 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/drivers/misc/rpmsgblk.c b/drivers/misc/rpmsgblk.c
index 2fc3dee4c3..586f5bad8c 100644
--- a/drivers/misc/rpmsgblk.c
+++ b/drivers/misc/rpmsgblk.c
@@ -143,7 +143,6 @@ static const rpmsg_ept_cb g_rpmsgblk_handler[] =
[RPMSGBLK_WRITE] = rpmsgblk_default_handler,
[RPMSGBLK_GEOMETRY] = rpmsgblk_geometry_handler,
[RPMSGBLK_IOCTL] = rpmsgblk_ioctl_handler,
- [RPMSGBLK_UNLINK] = rpmsgblk_default_handler,
};
/****************************************************************************
@@ -663,7 +662,8 @@ static int rpmsgblk_ioctl(FAR struct inode *inode, int cmd,
* Name: rpmsgblk_unlink
*
* Description:
- * Rpmsg-blk ioctl operation
+ * Rpmsg-blk unlink operation. Client can not delete the actual block
+ * device in server's side, so return success directly.
*
* Parameters:
* inode - the blk device inode
@@ -676,18 +676,7 @@ static int rpmsgblk_ioctl(FAR struct inode *inode, int cmd,
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
static int rpmsgblk_unlink(FAR struct inode *inode)
{
- FAR struct rpmsgblk_s *priv = inode->i_private;
- struct rpmsgblk_unlink_s msg;
- int ret;
-
- ret = rpmsgblk_send_recv(priv, RPMSGBLK_UNLINK, true, &msg.header,
- sizeof(msg), NULL);
- if (ret < 0)
- {
- ferr("unlink failed, ret=%d\n", ret);
- }
-
- return ret;
+ return OK;
}
#endif
diff --git a/drivers/misc/rpmsgblk.h b/drivers/misc/rpmsgblk.h
index ab5be5c24d..e486d657fa 100644
--- a/drivers/misc/rpmsgblk.h
+++ b/drivers/misc/rpmsgblk.h
@@ -42,7 +42,6 @@
#define RPMSGBLK_WRITE 4
#define RPMSGBLK_GEOMETRY 5
#define RPMSGBLK_IOCTL 6
-#define RPMSGBLK_UNLINK 7
/****************************************************************************
* Public Types
diff --git a/drivers/misc/rpmsgblk_server.c b/drivers/misc/rpmsgblk_server.c
index 908075f5fc..483f794865 100644
--- a/drivers/misc/rpmsgblk_server.c
+++ b/drivers/misc/rpmsgblk_server.c
@@ -73,9 +73,6 @@ static int rpmsgblk_geometry_handler(FAR struct rpmsg_endpoint *ept,
static int rpmsgblk_ioctl_handler(FAR struct rpmsg_endpoint *ept,
FAR void *data, size_t len,
uint32_t src, FAR void *priv);
-static int rpmsgblk_unlink_handler(FAR struct rpmsg_endpoint *ept,
- FAR void *data, size_t len,
- uint32_t src, FAR void *priv);
/* Functions for creating communication with client cpu */
@@ -102,7 +99,6 @@ static const rpmsg_ept_cb g_rpmsgblk_handler[] =
[RPMSGBLK_WRITE] = rpmsgblk_write_handler,
[RPMSGBLK_GEOMETRY] = rpmsgblk_geometry_handler,
[RPMSGBLK_IOCTL] = rpmsgblk_ioctl_handler,
- [RPMSGBLK_UNLINK] = rpmsgblk_unlink_handler,
};
/****************************************************************************
@@ -325,26 +321,6 @@ static int rpmsgblk_ioctl_handler(FAR struct rpmsg_endpoint *ept,
return rpmsg_send(ept, msg, len);
}
-/****************************************************************************
- * Name: rpmsgblk_unlink_handler
- ****************************************************************************/
-
-static int rpmsgblk_unlink_handler(FAR struct rpmsg_endpoint *ept,
- FAR void *data, size_t len,
- uint32_t src, FAR void *priv)
-{
- FAR struct rpmsgblk_unlink_s *msg = data;
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
- FAR struct rpmsgblk_server_s *server = ept->priv;
-
- msg->header.result = server->bops->unlink(server->blknode);
-#else
- msg->header.result = -ENXIO;
-#endif
-
- return rpmsg_send(ept, msg, len);
-}
-
/****************************************************************************
* Name: rpmsgblk_ns_match
****************************************************************************/