Add an unlink method to block driver interface. Same motivataion as for the same modification to the character driver interface

1 files changed, 16 insertions, 8 deletions

diff --git a/nuttx/fs/vfs/fs_unlink.c b/nuttx/fs/vfs/fs_unlink.c
index fae0b59b0..abd774d98 100644
--- a/nuttx/fs/vfs/fs_unlink.c
+++ b/nuttx/fs/vfs/fs_unlink.c
@@ -161,19 +161,27 @@ int unlink(FAR const char *pathname)
               goto errout_with_inode;
             }
 
-          /* Notify the character driver that it has been unlinked.  If
-           * there are no open references to the driver instance, then the
-           * driver should clean release all resources because it is no
-           * longer accessible.
+          /* Notify the driver that it has been unlinked.  If there are no
+           * open references to the driver instance, then the driver should
+           * release all resources because it is no longer accessible.
            */
 
           if (INODE_IS_DRIVER(inode) && inode->u.i_ops->unlink)
             {
-              /* The value passed to the driver is the same value that was
-               * provided to register_driver();
-               */
+              /* Notify the character driver that it has been unlinked */
 
-              ret = inode->u.i_ops->unlink(inode->i_private);
+              ret = inode->u.i_ops->unlink(inode);
+              if (ret < 0)
+                {
+                  errcode = -ret;
+                  goto errout_with_inode;
+                }
+            }
+          else if (INODE_IS_BLOCK(inode) && inode->u.i_bops->unlink)
+            {
+              /* Notify the block driver that it has been unlinked */
+
+              ret = inode->u.i_bops->unlink(inode);
               if (ret < 0)
                 {
                   errcode = -ret;