summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/orangefs/orangefs-kernel.h5
-rw-r--r--fs/orangefs/orangefs-utils.c12
2 files changed, 5 insertions, 12 deletions
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 785c9a4ef834..b6f52e3fee7f 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -555,11 +555,6 @@ int orangefs_unmount_sb(struct super_block *sb);
bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op);
-static inline __u64 orangefs_convert_time_field(const struct timespec *ts)
-{
- return (__u64)ts->tv_sec;
-}
-
int orangefs_normalize_to_errno(__s32 error_code);
extern struct mutex devreq_mutex;
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index 488f3501b09c..8ef9e9646748 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -202,9 +202,9 @@ static int copy_attributes_to_inode(struct inode *inode,
inode->i_uid = make_kuid(&init_user_ns, attrs->owner);
inode->i_gid = make_kgid(&init_user_ns, attrs->group);
- inode->i_atime.tv_sec = (time_t) attrs->atime;
- inode->i_mtime.tv_sec = (time_t) attrs->mtime;
- inode->i_ctime.tv_sec = (time_t) attrs->ctime;
+ inode->i_atime.tv_sec = (time64_t) attrs->atime;
+ inode->i_mtime.tv_sec = (time64_t) attrs->mtime;
+ inode->i_ctime.tv_sec = (time64_t) attrs->ctime;
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0;
inode->i_ctime.tv_nsec = 0;
@@ -301,16 +301,14 @@ static inline int copy_attributes_from_inode(struct inode *inode,
if (iattr->ia_valid & ATTR_ATIME) {
attrs->mask |= ORANGEFS_ATTR_SYS_ATIME;
if (iattr->ia_valid & ATTR_ATIME_SET) {
- attrs->atime =
- orangefs_convert_time_field(&iattr->ia_atime);
+ attrs->atime = (time64_t)iattr->ia_atime.tv_sec;
attrs->mask |= ORANGEFS_ATTR_SYS_ATIME_SET;
}
}
if (iattr->ia_valid & ATTR_MTIME) {
attrs->mask |= ORANGEFS_ATTR_SYS_MTIME;
if (iattr->ia_valid & ATTR_MTIME_SET) {
- attrs->mtime =
- orangefs_convert_time_field(&iattr->ia_mtime);
+ attrs->mtime = (time64_t)iattr->ia_mtime.tv_sec;
attrs->mask |= ORANGEFS_ATTR_SYS_MTIME_SET;
}
}