orangefs: sanitize pvfs2_convert_time_field()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/pvfs2-kernel.h b/fs/orangefs/pvfs2-kernel.h
index c36868be03dce04a60697a5cf0c3e968e0d0c065..e962517179666820177fd3cd9a5afa6027d13145 100644 (file)
--- a/fs/orangefs/pvfs2-kernel.h
+++ b/fs/orangefs/pvfs2-kernel.h
@@ -638,7 +638,10 @@ int pvfs2_unmount_sb(struct super_block *sb);
 
 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);
 

diff --git a/fs/orangefs/pvfs2-utils.c b/fs/orangefs/pvfs2-utils.c
index c33e7193599c165e8b9377ff84817102556ce0b0..1180a2480d2bd37e472c42dd9b755668325b5aef 100644 (file)
--- a/fs/orangefs/pvfs2-utils.c
+++ b/fs/orangefs/pvfs2-utils.c
@@ -298,7 +298,7 @@ static inline int copy_attributes_from_inode(struct inode *inode,
                attrs->mask |= PVFS_ATTR_SYS_ATIME;
                if (iattr->ia_valid & ATTR_ATIME_SET) {
                        attrs->atime =
-                           pvfs2_convert_time_field((void *)&iattr->ia_atime);
+                           pvfs2_convert_time_field(&iattr->ia_atime);
                        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;
                if (iattr->ia_valid & ATTR_MTIME_SET) {
                        attrs->mtime =
-                           pvfs2_convert_time_field((void *)&iattr->ia_mtime);
+                           pvfs2_convert_time_field(&iattr->ia_mtime);
                        attrs->mask |= PVFS_ATTR_SYS_MTIME_SET;
                }
        }
@@ -653,15 +653,6 @@ void set_signals(sigset_t *sigset)
        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
  * PVFS2 protocol. See protocol.h for more error definitions.