diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/file.c | 14 | ||||
| -rw-r--r-- | fs/f2fs/super.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 58599ab4937d..3b5ad281b518 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1112,17 +1112,13 @@ static void __setattr_copy(struct mnt_idmap *idmap, struct inode *inode, const struct iattr *attr) { unsigned int ia_valid = attr->ia_valid; + struct iattr sattr = *attr; - i_uid_update(idmap, attr, inode); - i_gid_update(idmap, attr, inode); - if (ia_valid & ATTR_ATIME) - inode_set_atime_to_ts(inode, attr->ia_atime); - if (ia_valid & ATTR_MTIME) - inode_set_mtime_to_ts(inode, attr->ia_mtime); - if (ia_valid & ATTR_CTIME) - inode_set_ctime_to_ts(inode, attr->ia_ctime); + sattr.ia_valid &= ~ATTR_MODE; + + setattr_copy(idmap, inode, &sattr); if (ia_valid & ATTR_MODE) { - umode_t mode = attr->ia_mode; + umode_t mode = sattr.ia_mode; if (!in_group_or_capable(idmap, inode, i_gid_into_vfsgid(idmap, inode))) mode &= ~S_ISGID; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 6a35144a2f7f..54431da34edf 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -5766,7 +5766,7 @@ static struct file_system_type f2fs_fs_type = { .name = "f2fs", .init_fs_context = f2fs_init_fs_context, .kill_sb = kill_f2fs_super, - .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP, + .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_MGTIME, }; MODULE_ALIAS_FS("f2fs"); |