AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

orangefs: sanitize pvfs2_convert_time_field()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Al Viro 2015-10-08 22:02:00 -04:00 committed by Mike Marshall
parent aada5c5872
commit 5714156be2
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/orangefs/pvfs2-kernel.h
View File

@ -638,7 +638,10 @@ int pvfs2_unmount_sb(struct super_block *sb);
int pvfs2_cancel_op_in_progress(__u64 tag); int pvfs2_cancel_op_in_progress(__u64 tag);
__u64 pvfs2_convert_time_field(void *time_ptr); static inline __u64 pvfs2_convert_time_field(const struct timespec *ts)
{
return (__u64)ts->tv_sec;
}
int pvfs2_normalize_to_errno(__s32 error_code); int pvfs2_normalize_to_errno(__s32 error_code);

13
fs/orangefs/pvfs2-utils.c
View File

@ -298,7 +298,7 @@ static inline int copy_attributes_from_inode(struct inode *inode,
attrs->mask |= PVFS_ATTR_SYS_ATIME; attrs->mask |= PVFS_ATTR_SYS_ATIME;
if (iattr->ia_valid & ATTR_ATIME_SET) { if (iattr->ia_valid & ATTR_ATIME_SET) {
attrs->atime = attrs->atime =
pvfs2_convert_time_field((void *)&iattr->ia_atime); pvfs2_convert_time_field(&iattr->ia_atime);
attrs->mask |= PVFS_ATTR_SYS_ATIME_SET; attrs->mask |= PVFS_ATTR_SYS_ATIME_SET;
} }
} }
@ -306,7 +306,7 @@ static inline int copy_attributes_from_inode(struct inode *inode,
attrs->mask |= PVFS_ATTR_SYS_MTIME; attrs->mask |= PVFS_ATTR_SYS_MTIME;
if (iattr->ia_valid & ATTR_MTIME_SET) { if (iattr->ia_valid & ATTR_MTIME_SET) {
attrs->mtime = attrs->mtime =
pvfs2_convert_time_field((void *)&iattr->ia_mtime); pvfs2_convert_time_field(&iattr->ia_mtime);
attrs->mask |= PVFS_ATTR_SYS_MTIME_SET; attrs->mask |= PVFS_ATTR_SYS_MTIME_SET;
} }
} }
@ -653,15 +653,6 @@ void set_signals(sigset_t *sigset)
sigprocmask(SIG_SETMASK, sigset, NULL); sigprocmask(SIG_SETMASK, sigset, NULL);
} }
__u64 pvfs2_convert_time_field(void *time_ptr)
{
__u64 pvfs2_time;
struct timespec *tspec = (struct timespec *)time_ptr;
pvfs2_time = (__u64) ((time_t) tspec->tv_sec);
return pvfs2_time;
}
/* /*
* The following is a very dirty hack that is now a permanent part of the * The following is a very dirty hack that is now a permanent part of the
* PVFS2 protocol. See protocol.h for more error definitions. * PVFS2 protocol. See protocol.h for more error definitions.