opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: successful file/directory removal may reported "Input/Output error"

master
szaka 2007-11-18 22:37:04 +00:00
parent 5d7af2f653
commit 4ab5ed8a49
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libntfs-3g/dir.c
View File

@ -1488,7 +1488,7 @@ search:
*/
if (ni->mrec->link_count) {
ntfs_inode_update_times(ni, NTFS_UPDATE_CTIME);
goto out;
goto ok;
}
ntfs_attr_reinit_search_ctx(actx);
while (!ntfs_attrs_walk(actx)) {
@ -1530,12 +1530,16 @@ search:
"Leaving inconsistent metadata.\n");
}
ni = NULL;
ok:
ntfs_inode_update_times(dir_ni, NTFS_UPDATE_MCTIME);
out:
if (actx)
ntfs_attr_put_search_ctx(actx);
if (ictx)
ntfs_index_ctx_put(ictx);
if (ni && ntfs_inode_close(ni) && !err)
if (ntfs_inode_close(dir_ni) && !err)
err = errno;
if (ntfs_inode_close(ni) && !err)
err = errno;
if (err) {
errno = err;

16
src/ntfs-3g.c
View File

@ -1020,21 +1020,17 @@ static int ntfs_fuse_rm(const char *org_path)
res = -errno;
goto exit;
}
/* Delete object. */
if (ntfs_delete(ni, dir_ni, uname, uname_len)) {
if (ntfs_delete(ni, dir_ni, uname, uname_len))
res = -errno;
} else {
/* Inode ctime is updated in ntfs_delete() for hard links. */
ntfs_fuse_update_times(dir_ni, NTFS_UPDATE_MCTIME);
}
/* ntfs_delete() always closes ni */
ni = NULL;
/* ntfs_delete() always closes ni and dir_ni */
ni = dir_ni = NULL;
exit:
if (ntfs_inode_close(dir_ni))
set_fuse_error(&res);
if (ntfs_inode_close(ni))
set_fuse_error(&res);
free(uname);
if (ntfs_inode_close(dir_ni))
set_fuse_error(&res);
free(path);
return res;
}