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

Fixed synchronization of attribs and timestamps to parent directory

PERMISSION_HANDLING_BRANCH
jpandre 2009-11-25 14:37:00 +00:00
parent 9279c2e493
commit 22ecdf8298
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libntfs-3g/inode.c
View File

@ -601,6 +601,7 @@ static int ntfs_inode_sync_file_name(ntfs_inode *ni)
ntfs_index_context *ictx; ntfs_index_context *ictx;
ntfs_inode *index_ni; ntfs_inode *index_ni;
FILE_NAME_ATTR *fn; FILE_NAME_ATTR *fn;
FILE_NAME_ATTR *fnx;
int err = 0; int err = 0;
ntfs_log_trace("Entering for inode %lld\n", (long long)ni->mft_no); ntfs_log_trace("Entering for inode %lld\n", (long long)ni->mft_no);
@ -658,17 +659,22 @@ static int ntfs_inode_sync_file_name(ntfs_inode *ni)
continue; continue;
} }
/* Update flags and file size. */ /* Update flags and file size. */
fn = (FILE_NAME_ATTR *)ictx->data; fnx = (FILE_NAME_ATTR *)ictx->data;
fn->file_attributes = fnx->file_attributes =
(fn->file_attributes & ~FILE_ATTR_VALID_FLAGS) | (fnx->file_attributes & ~FILE_ATTR_VALID_FLAGS) |
(ni->flags & FILE_ATTR_VALID_FLAGS); (ni->flags & FILE_ATTR_VALID_FLAGS);
fn->allocated_size = cpu_to_sle64(ni->allocated_size); fnx->allocated_size = cpu_to_sle64(ni->allocated_size);
fn->data_size = cpu_to_sle64(ni->data_size); fnx->data_size = cpu_to_sle64(ni->data_size);
if (test_nino_flag(ni, TimesDirty)) { if (test_nino_flag(ni, TimesDirty)) {
fn->creation_time = utc2ntfs(ni->creation_time); fnx->creation_time = utc2ntfs(ni->creation_time);
fn->last_data_change_time = utc2ntfs(ni->last_data_change_time); fnx->last_data_change_time = utc2ntfs(ni->last_data_change_time);
fn->last_mft_change_time = utc2ntfs(ni->last_mft_change_time); fnx->last_mft_change_time = utc2ntfs(ni->last_mft_change_time);
fn->last_access_time = utc2ntfs(ni->last_access_time); fnx->last_access_time = utc2ntfs(ni->last_access_time);
} else {
fnx->creation_time = fn->creation_time;
fnx->last_data_change_time = fn->last_data_change_time;
fnx->last_mft_change_time = fn->last_mft_change_time;
fnx->last_access_time = fn->last_access_time;
} }
ntfs_index_entry_mark_dirty(ictx); ntfs_index_entry_mark_dirty(ictx);
ntfs_index_ctx_put(ictx); ntfs_index_ctx_put(ictx);
@ -1304,6 +1310,7 @@ int ntfs_inode_set_times(const char *path __attribute__((unused)),
std_info->last_access_time = cpu_to_le64(times[2]); std_info->last_access_time = cpu_to_le64(times[2]);
std_info->last_mft_change_time = now; std_info->last_mft_change_time = now;
ntfs_inode_mark_dirty(ctx->ntfs_ino); ntfs_inode_mark_dirty(ctx->ntfs_ino);
NInoFileNameSetDirty(ni);
/* update the file names attributes */ /* update the file names attributes */
ntfs_attr_reinit_search_ctx(ctx); ntfs_attr_reinit_search_ctx(ctx);

7
libntfs-3g/reparse.c
View File

@ -1185,9 +1185,11 @@ int ntfs_set_ntfs_reparse_data(const char *path __attribute__((unused)),
AT_REPARSE_POINT, AT_REPARSE_POINT,
AT_UNNAMED,0,&dummy, AT_UNNAMED,0,&dummy,
(s64)0); (s64)0);
if (!res) if (!res) {
ni->flags |= ni->flags |=
FILE_ATTR_REPARSE_POINT; FILE_ATTR_REPARSE_POINT;
NInoFileNameSetDirty(ni);
}
NInoSetDirty(ni); NInoSetDirty(ni);
} else { } else {
errno = EOPNOTSUPP; errno = EOPNOTSUPP;
@ -1258,6 +1260,7 @@ int ntfs_remove_ntfs_reparse_data(const char *path __attribute__((unused)),
if (!res) { if (!res) {
ni->flags &= ni->flags &=
~FILE_ATTR_REPARSE_POINT; ~FILE_ATTR_REPARSE_POINT;
NInoFileNameSetDirty(ni);
} else { } else {
/* /*
* If we could not remove the * If we could not remove the

1
libntfs-3g/security.c
View File

@ -4079,6 +4079,7 @@ int ntfs_set_ntfs_attrib(const char *path __attribute__((unused)),
if (!res) { if (!res) {
ni->flags = (ni->flags & ~settable) ni->flags = (ni->flags & ~settable)
| (cpu_to_le32(attrib) & settable); | (cpu_to_le32(attrib) & settable);
NInoFileNameSetDirty(ni);
NInoSetDirty(ni); NInoSetDirty(ni);
} }
} else } else