openharmony/third_party_NuttX
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_NuttX.git synced 2026-07-01 08:17:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

!17 fix nfs rmdir crash

Browse Source 
Merge pull request !17 from 野生毛霉君/master
This commit is contained in:
openharmony_ci
2021-04-09 17:19:46 +08:00
committed by Gitee
parent 4f5f93ff51 e5709a2ae6
commit 08ca99d030
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/nfs/nfs_adapter.c
+7 -6
View File
@@ -2229,12 +2229,6 @@ int vfs_nfs_rmdir(struct Vnode *parent, struct Vnode *target, char *dirname)
int namelen;
uint32_t *ptr = NULL;
int error;
if (target_node->n_type != NFDIR)
{
PRINTK("ERROR: try to remove a non-dir\n");
return -ENOTDIR;
}
nfs_mux_take(nmp);
error = nfs_checkmount(nmp);
if (error != OK)
@@ -2245,6 +2239,13 @@ int vfs_nfs_rmdir(struct Vnode *parent, struct Vnode *target, char *dirname)
parent_node = (struct nfsnode*)(parent->data);
target_node = (struct nfsnode*)(target->data);
if (target_node->n_type != NFDIR)
{
PRINTK("ERROR: try to remove a non-dir\n");
return -ENOTDIR;
}
/* Set up the RMDIR call message arguments */
ptr = (uint32_t *)&nmp->nm_msgbuffer.rmdir.rmdir;