i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* In bfs_write_stat() B_STAT_UID, B_STAT_GID, and B_STAT_MODE now also trigger

Browse Source 
an update of st_mtime. This is a work-around for the unmaintained st_ctime,
  and this also fixes bug #3143.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28734 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-11-26 10:24:11 +00:00
parent d09596f530
commit b614227bfd
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+21 -9
View File
@@ -730,6 +730,7 @@ bfs_write_stat(fs_volume* _volume, fs_vnode* _node, const struct stat* stat,
inode->WriteLockInTransaction(transaction); inode->WriteLockInTransaction(transaction);
bfs_inode& node = inode->Node(); bfs_inode& node = inode->Node();
bool updateTime = false;
if ((mask & B_STAT_SIZE) != 0) { if ((mask & B_STAT_SIZE) != 0) {
// Since WSTAT_SIZE is the only thing that can fail directly, we // Since WSTAT_SIZE is the only thing that can fail directly, we
@@ -755,33 +756,44 @@ bfs_write_stat(fs_volume* _volume, fs_vnode* _node, const struct stat* stat,
Index index(volume); Index index(volume);
index.UpdateSize(transaction, inode); index.UpdateSize(transaction, inode);
if ((mask & B_STAT_MODIFICATION_TIME) == 0) updateTime = true;
index.UpdateLastModified(transaction, inode);
} }
} }
} }
// Note, the following changes (mode/uid/gid) would update st_ctime;
// since we don't have that, we'll use st_mtime instead.
if ((mask & B_STAT_MODE) != 0) { if ((mask & B_STAT_MODE) != 0) {
PRINT(("original mode = %ld, stat->st_mode = %d\n", node.Mode(), stat->st_mode)); PRINT(("original mode = %ld, stat->st_mode = %d\n", node.Mode(), stat->st_mode));
node.mode = HOST_ENDIAN_TO_BFS_INT32((node.Mode() & ~S_IUMSK) node.mode = HOST_ENDIAN_TO_BFS_INT32((node.Mode() & ~S_IUMSK)
| (stat->st_mode & S_IUMSK)); | (stat->st_mode & S_IUMSK));
updateTime = true;
} }
if ((mask & B_STAT_UID) != 0) if ((mask & B_STAT_UID) != 0) {
node.uid = HOST_ENDIAN_TO_BFS_INT32(stat->st_uid); node.uid = HOST_ENDIAN_TO_BFS_INT32(stat->st_uid);
if ((mask & B_STAT_GID) != 0) updateTime = true;
}
if ((mask & B_STAT_GID) != 0) {
node.gid = HOST_ENDIAN_TO_BFS_INT32(stat->st_gid); node.gid = HOST_ENDIAN_TO_BFS_INT32(stat->st_gid);
updateTime = true;
}
if ((mask & B_STAT_MODIFICATION_TIME) != 0 || updateTime) {
bigtime_t newTime;
if ((mask & B_STAT_MODIFICATION_TIME) == 0)
newTime = (bigtime_t)time(NULL) << INODE_TIME_SHIFT;
else
newTime = stat->st_mtime << INODE_TIME_SHIFT;
if ((mask & B_STAT_MODIFICATION_TIME) != 0) {
if (!inode->InLastModifiedIndex()) { if (!inode->InLastModifiedIndex()) {
// directory modification times are not part of the index // directory modification times are not part of the index
node.last_modified_time = HOST_ENDIAN_TO_BFS_INT64( node.last_modified_time = HOST_ENDIAN_TO_BFS_INT64(newTime);
(bigtime_t)stat->st_mtime << INODE_TIME_SHIFT);
} else if (!inode->IsDeleted()) { } else if (!inode->IsDeleted()) {
// Index::UpdateLastModified() will set the new time in the inode // Index::UpdateLastModified() will set the new time in the inode
Index index(volume); Index index(volume);
index.UpdateLastModified(transaction, inode, index.UpdateLastModified(transaction, inode, newTime);
(bigtime_t)stat->st_mtime << INODE_TIME_SHIFT);
} }
} }
if ((mask & B_STAT_CREATION_TIME) != 0) { if ((mask & B_STAT_CREATION_TIME) != 0) {