RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-03-11 07:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: obey MARS_DELETED_STR otherwise

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-03-04 12:37:07 +01:00 committed by Thomas Schoebel-Theuer
parent 7d6bdf945f
commit b3fb3d3731
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/sy_old/sy_generic.c
View File

@ -1201,7 +1201,7 @@ struct mars_cookie {
};
static
int get_inode(char *newpath, struct mars_dent *dent)
int get_inode(char *newpath, struct mars_dent *dent, bool get_deleted)
{
mm_segment_t oldfs;
int status;
@ -1281,6 +1281,15 @@ int get_inode(char *newpath, struct mars_dent *dent)
dent->old_link = dent->new_link;
dent->new_link = link;
}
/* Treat deleted dents as non-existing.
* Killing will be done later via ->killme.
*/
if (!get_deleted &&
status >= 0 &&
dent->new_link &&
!strcmp(dent->new_link, MARS_DELETED_STR)) {
status = -ENOENT;
}
done_put:
path_put(&path);
} else if (S_ISREG(dent->new_stat.mode) && dent->d_name && !strncmp(dent->d_name, "log-", 4)) {
@ -1370,7 +1379,7 @@ int mars_filler(void *__buf, const char *name, int namlen, loff_t offset,
cookie->hit = true;
if (name[0] == '.') {
if (!name || !*name || name[0] == '.') {
return 0;
}
@ -1523,7 +1532,6 @@ void _mars_order_all(struct mars_cookie *cookie)
while (!list_empty(&cookie->tmp_anchor)) {
struct list_head *tmp = cookie->tmp_anchor.next;
struct mars_dent *dent = container_of(tmp, struct mars_dent, dent_link);
list_del_init(tmp);
/* When some_ordered: only sort links spawning
* a .cl_forward action (with some unimportant exceptions).
@ -1559,6 +1567,18 @@ void _mars_order_all(struct mars_cookie *cookie)
if (dent->d_parent)
dent->d_parent->d_child_count++;
} else {
char *check;
/* Do not add _new_ dents when deleted.
* Existing ones are treated in get_inode().
*/
check = mars_readlink(dent->d_path);
if (check && !strcmp(check, MARS_DELETED_STR)) {
brick_string_free(check);
mars_free_dent(cookie->global, dent);
continue;
}
brick_string_free(check);
_mars_order(cookie, dent);
}
}
@ -1665,7 +1685,7 @@ int _op_scan(struct say_channel **say_channel,
bind_to_dent(dent, say_channel);
//MARS_IO("reading inode '%s'\n", dent->d_path);
status = get_inode(dent->d_path, dent);
status = get_inode(dent->d_path, dent, some_ordered);
total_status |= status;
// mark gone dents for removal