Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clean-up files in fs/ directory

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4942 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-07-14 21:05:40 +00:00
parent 76cac1fce9
commit 40b9bd7a97
43 changed files with 371 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/fs_inoderemove.c
+27 -25
View File
@@ -2,7 +2,7 @@
* fs/fs_inoderemove.c
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -74,27 +74,28 @@ static void inode_unlink(struct inode *node,
* of that peer node.
*/
if (peer)
{
peer->i_peer = node->i_peer;
}
if (peer)
{
peer->i_peer = node->i_peer;
}
/* If parent is non-null, then remove the node from head of
* of the list of children.
*/
/* If parent is non-null, then remove the node from head of
* of the list of children.
*/
else if (parent)
{
parent->i_child = node->i_peer;
}
else if (parent)
{
parent->i_child = node->i_peer;
}
/* Otherwise, we must be removing the root inode. */
/* Otherwise, we must be removing the root inode. */
else
{
root_inode = node->i_peer;
}
node->i_peer = NULL;
else
{
root_inode = node->i_peer;
}
node->i_peer = NULL;
}
/****************************************************************************
@@ -105,6 +106,7 @@ static void inode_unlink(struct inode *node,
* Name: inode_remove
*
* NOTE: Caller must hold the inode semaphore
*
****************************************************************************/
int inode_remove(const char *path)
@@ -132,16 +134,16 @@ int inode_remove(const char *path)
if (node->i_crefs)
{
/* In that case, we will mark it deleted, when the FS
* releases the inode, we will then, finally delete
* the subtree.
*/
/* In that case, we will mark it deleted, when the FS
* releases the inode, we will then, finally delete
* the subtree.
*/
node->i_flags |= FSNODEFLAG_DELETED;
return -EBUSY;
}
else
{
}
else
{
/* And delete it now -- recursively to delete all of its children */
inode_free(node->i_child);