Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be81ce48 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mike Marshall
Browse files

orangefs: avoid time conversion function 



The new orangefs code uses a helper function to read a time field to
its private structures from struct iattr. This will conflict with the
move to 64-bit timestamps in the kernel and is generally not necessary.

This replaces the conversion with a simple cast to time64_t that shows
what is going on. As the orangefs-internal representation already uses
64-bit timestamps, there should be no ambiguity to negative values,
and the cast ensures that we treat them as times before 1970 on both
32-bit and 64-bit architectures, rather than times after 2038. This
patch keeps that behavior.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 69a23de2

fs/orangefs/orangefs-kernel.h

+0 −5
Original line number Diff line number Diff line
@@ -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;

fs/orangefs/orangefs-utils.c

+5 −7
Original line number Diff line number Diff line
@@ -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;

		}

	}