Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7769
b: refs/heads/master
c: 1c7d469
h: refs/heads/master
i:
  7767: b5158bf
v: v3
  • Loading branch information
Anton Altaparmakov committed Sep 8, 2005
1 parent dcbe057 commit fde31c8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bbf1813fb8ff9d21171bf22e6d1f0e0393601e86
refs/heads/master: 1c7d469d47668f4664b892a6cd1c452a0c02d710
2 changes: 2 additions & 0 deletions trunk/fs/ntfs/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ ToDo/Notes:
- Fix cluster (de)allocators to work when the runlist is NULL and more
importantly to take a locked runlist rather than them locking it
which leads to lock reversal.
- Truncate {a,c,m}time to the ntfs supported time granularity when
updating the times in the inode in ntfs_setattr().

2.1.23 - Implement extension of resident files and make writing safe as well as
many bug fixes, cleanups, and enhancements...
Expand Down
12 changes: 7 additions & 5 deletions trunk/fs/ntfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2430,16 +2430,18 @@ int ntfs_setattr(struct dentry *dentry, struct iattr *attr)
* We skipped the truncate but must still update
* timestamps.
*/
ia_valid |= ATTR_MTIME|ATTR_CTIME;
ia_valid |= ATTR_MTIME | ATTR_CTIME;
}
}

if (ia_valid & ATTR_ATIME)
vi->i_atime = attr->ia_atime;
vi->i_atime = timespec_trunc(attr->ia_atime,
vi->i_sb->s_time_gran);
if (ia_valid & ATTR_MTIME)
vi->i_mtime = attr->ia_mtime;
vi->i_mtime = timespec_trunc(attr->ia_mtime,
vi->i_sb->s_time_gran);
if (ia_valid & ATTR_CTIME)
vi->i_ctime = attr->ia_ctime;
vi->i_ctime = timespec_trunc(attr->ia_ctime,
vi->i_sb->s_time_gran);
mark_inode_dirty(vi);
out:
return err;
Expand Down

0 comments on commit fde31c8

Please sign in to comment.