[rtems-libbsd commit] rtemsbsd/vfs: Use VOP_REMOVE to remove file nodes

[Chris Johns]

Module:    rtems-libbsd
Branch:    6-freebsd-12
Commit:    7cc487f2d33d8607958f22728155999bcb61f97b
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=7cc487f2d33d8607958f22728155999bcb61f97b

Author:    Chris Johns <chrisj at rtems.org>
Date:      Mon Aug  7 07:58:30 2023 +1000

rtemsbsd/vfs: Use VOP_REMOVE to remove file nodes

---

 rtemsbsd/rtems/rtems-kernel-vfs.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rtemsbsd/rtems/rtems-kernel-vfs.c b/rtemsbsd/rtems/rtems-kernel-vfs.c
index 0817df81..69c9ba56 100644
--- a/rtemsbsd/rtems/rtems-kernel-vfs.c
+++ b/rtemsbsd/rtems/rtems-kernel-vfs.c
@@ -679,7 +679,11 @@ restart:
 		goto restart;
 	}
 	vfs_notify_upper(vp, VFS_NOTIFY_UPPER_UNLINK);
-	error = VOP_RMDIR(dvp, vp, &cn);
+	if (vp->v_type == VDIR) {
+		error = VOP_RMDIR(dvp, vp, &cn);
+	} else {
+		error = VOP_REMOVE(dvp, vp, &cn);
+	}
 	vn_finished_write(mp);
 out:
 	return rtems_bsd_error_to_status_and_errno(error);