ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6a99ff0a: am 3a4aedfc: Merge "sdcard: Properly handle deleted nodes"

Browse source 
* commit '6a99ff0adfa8949cce11cd47142a3d550421904e':
  sdcard: Properly handle deleted nodes
This commit is contained in:
Elliott Hughes 2015-04-04 00:44:35 +00:00 • committed by Android Git Automerger
commit 03c0adab88
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sdcard/sdcard.c
View file

@ -199,6 +199,8 @@ struct node {
* position. Used to support things like OBB. */
char* graft_path;
size_t graft_pathlen;
bool deleted;
};
static int str_hash(void *key) {
@ -631,6 +633,8 @@ struct node *create_node_locked(struct fuse* fuse,
node->ino = fuse->inode_ctr++;
node->gen = fuse->next_generation++;
node->deleted = false;
derive_permissions_locked(fuse, parent, node);
acquire_node_locked(node);
add_node_to_parent_locked(node, parent);
@ -704,7 +708,7 @@ static struct node *lookup_child_by_name_locked(struct node *node, const char *n
* must be considered distinct even if they refer to the same
* underlying file as otherwise operations such as "mv x x"
* will not work because the source and target nodes are the same. */
if (!strcmp(name, node->name)) {
if (!strcmp(name, node->name) && !node->deleted) {
return node;
}
}
@ -1070,6 +1074,7 @@ static int handle_unlink(struct fuse* fuse, struct fuse_handler* handler,
{
bool has_rw;
struct node* parent_node;
struct node* child_node;
char parent_path[PATH_MAX];
char child_path[PATH_MAX];
@ -1091,6 +1096,12 @@ static int handle_unlink(struct fuse* fuse, struct fuse_handler* handler,
if (unlink(child_path) < 0) {
return -errno;
}
pthread_mutex_lock(&fuse->lock);
child_node = lookup_child_by_name_locked(parent_node, name);
if (child_node) {
child_node->deleted = true;
}
pthread_mutex_unlock(&fuse->lock);
return 0;
}
@ -1098,6 +1109,7 @@ static int handle_rmdir(struct fuse* fuse, struct fuse_handler* handler,
const struct fuse_in_header* hdr, const char* name)
{
bool has_rw;
struct node* child_node;
struct node* parent_node;
char parent_path[PATH_MAX];
char child_path[PATH_MAX];
@ -1120,6 +1132,12 @@ static int handle_rmdir(struct fuse* fuse, struct fuse_handler* handler,
if (rmdir(child_path) < 0) {
return -errno;
}
pthread_mutex_lock(&fuse->lock);
child_node = lookup_child_by_name_locked(parent_node, name);
if (child_node) {
child_node->deleted = true;
}
pthread_mutex_unlock(&fuse->lock);
return 0;
}