<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, May 10, 2021 at 12:48 PM Gedare Bloom <<a href="mailto:gedare@rtems.org">gedare@rtems.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Thu, May 6, 2021 at 1:51 PM Ryan Long <<a href="mailto:ryan.long@oarcorp.com" target="_blank">ryan.long@oarcorp.com</a>> wrote:<br>
><br>
> Also updated licenses.<br>
><br>
> Closes #4400<br>
> ---<br>
> bsps/arm/csb337/umon/tfsDriver.c | 2 +-<br>
> cpukit/Makefile.am | 4 +--<br>
> cpukit/include/rtems/confdefs/libio.h | 4 +--<br>
> cpukit/include/rtems/imfs.h | 7 +++--<br>
> cpukit/include/rtems/libio.h | 21 +++++++--------<br>
> cpukit/libcsupport/src/__usrenv.c | 9 +++----<br>
> cpukit/libfs/src/defaults/default_ops.c | 2 +-<br>
> cpukit/libfs/src/defaults/default_utime.c | 32 ----------------------<br>
> cpukit/libfs/src/defaults/default_utimens.c | 33 +++++++++++++++++++++++<br>
> cpukit/libfs/src/dosfs/msdos_init.c | 11 ++++----<br>
> cpukit/libfs/src/ftpfs/ftpfs.c | 2 +-<br>
> cpukit/libfs/src/ftpfs/tftpDriver.c | 2 +-<br>
> cpukit/libfs/src/imfs/imfs_init.c | 4 +--<br>
> cpukit/libfs/src/imfs/imfs_utime.c | 41 ----------------------------<br>
> cpukit/libfs/src/imfs/imfs_utimens.c | 42 +++++++++++++++++++++++++++++<br>
> cpukit/libfs/src/jffs2/src/fs-rtems.c | 11 ++++----<br>
> cpukit/libfs/src/rfs/rtems-rfs-rtems.c | 16 +++++------<br>
> spec/build/cpukit/librtemscpu.yml | 4 +--<br>
> 18 files changed, 120 insertions(+), 127 deletions(-)<br>
> delete mode 100644 cpukit/libfs/src/defaults/default_utime.c<br>
> create mode 100644 cpukit/libfs/src/defaults/default_utimens.c<br>
> delete mode 100644 cpukit/libfs/src/imfs/imfs_utime.c<br>
> create mode 100644 cpukit/libfs/src/imfs/imfs_utimens.c<br>
><br>
> diff --git a/bsps/arm/csb337/umon/tfsDriver.c b/bsps/arm/csb337/umon/tfsDriver.c<br>
> index 0195346..caf3a4b 100644<br>
> --- a/bsps/arm/csb337/umon/tfsDriver.c<br>
> +++ b/bsps/arm/csb337/umon/tfsDriver.c<br>
> @@ -657,7 +657,7 @@ static const rtems_filesystem_operations_table rtems_tfs_ops = {<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = rtems_filesystem_default_fsunmount,<br>
> - .utime_h = rtems_filesystem_default_utime,<br>
> + .utimens_h = rtems_filesystem_default_utimens,<br>
> .symlink_h = rtems_filesystem_default_symlink,<br>
> .readlink_h = rtems_filesystem_default_readlink,<br>
> .rename_h = rtems_filesystem_default_rename,<br>
> diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am<br>
> index 29b4207..c144773 100644<br>
> --- a/cpukit/Makefile.am<br>
> +++ b/cpukit/Makefile.am<br>
> @@ -377,7 +377,7 @@ librtemscpu_a_SOURCES += libfs/src/defaults/default_rmnod.c<br>
> librtemscpu_a_SOURCES += libfs/src/defaults/default_statvfs.c<br>
> librtemscpu_a_SOURCES += libfs/src/defaults/default_symlink.c<br>
> librtemscpu_a_SOURCES += libfs/src/defaults/default_unmount.c<br>
> -librtemscpu_a_SOURCES += libfs/src/defaults/default_utime.c<br>
> +librtemscpu_a_SOURCES += libfs/src/defaults/default_utimens.c<br>
> librtemscpu_a_SOURCES += libfs/src/defaults/default_write.c<br>
> librtemscpu_a_SOURCES += libfs/src/defaults/default_writev.c<br>
> librtemscpu_a_SOURCES += libfs/src/dosfs/fat.c<br>
> @@ -434,7 +434,7 @@ librtemscpu_a_SOURCES += libfs/src/imfs/imfs_stat.c<br>
> librtemscpu_a_SOURCES += libfs/src/imfs/imfs_stat_file.c<br>
> librtemscpu_a_SOURCES += libfs/src/imfs/imfs_symlink.c<br>
> librtemscpu_a_SOURCES += libfs/src/imfs/imfs_unmount.c<br>
> -librtemscpu_a_SOURCES += libfs/src/imfs/imfs_utime.c<br>
> +librtemscpu_a_SOURCES += libfs/src/imfs/imfs_utimens.c<br>
> librtemscpu_a_SOURCES += libfs/src/imfs/ioman.c<br>
> librtemscpu_a_SOURCES += libfs/src/pipe/fifo.c<br>
> librtemscpu_a_SOURCES += libfs/src/pipe/pipe.c<br>
> diff --git a/cpukit/include/rtems/confdefs/libio.h b/cpukit/include/rtems/confdefs/libio.h<br>
> index 16a4fb69..1b84f8c 100644<br>
> --- a/cpukit/include/rtems/confdefs/libio.h<br>
> +++ b/cpukit/include/rtems/confdefs/libio.h<br>
> @@ -231,9 +231,9 @@ static const rtems_filesystem_operations_table IMFS_root_ops = {<br>
> #endif<br>
> rtems_filesystem_default_fsunmount,<br>
> #ifdef CONFIGURE_IMFS_DISABLE_UTIME<br>
> - rtems_filesystem_default_utime,<br>
> + rtems_filesystem_default_utimens,<br>
> #else<br>
> - IMFS_utime,<br>
> + IMFS_utimens,<br>
> #endif<br>
> #ifdef CONFIGURE_IMFS_DISABLE_SYMLINK<br>
> rtems_filesystem_default_symlink,<br>
> diff --git a/cpukit/include/rtems/imfs.h b/cpukit/include/rtems/imfs.h<br>
> index b2a9868..6e0d5d5 100644<br>
> --- a/cpukit/include/rtems/imfs.h<br>
> +++ b/cpukit/include/rtems/imfs.h<br>
> @@ -5,7 +5,7 @@<br>
> */<br>
><br>
> /*<br>
> - * COPYRIGHT (c) 1989-2011.<br>
> + * COPYRIGHT (c) 1989-2011, 2021.<br>
> * On-Line Applications Research Corporation (OAR).<br>
> *<br>
> * The license and distribution terms for this file may be<br>
fix license?<br></blockquote><div><br></div><div>That is OK. And add SPDX.</div><div><br></div><div>I've generally encouraged only changing the license and adding SPDX</div><div>on files with substantial change. </div><div><br></div><div>But a part of me just wants to rip through areas which are clearly</div><div>written by the core developers who have agreed to the relicense. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> @@ -954,10 +954,9 @@ extern int device_ftruncate(<br>
> * This routine is the implementation of the utime() system<br>
> * call for the IMFS.<br>
> */<br>
> -extern int IMFS_utime(<br>
> +extern int IMFS_utimens(<br>
> const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> + struct timespec times[2]<br>
> );<br>
><br>
> /**<br>
> diff --git a/cpukit/include/rtems/libio.h b/cpukit/include/rtems/libio.h<br>
> index 519e797..99543ba 100644<br>
> --- a/cpukit/include/rtems/libio.h<br>
> +++ b/cpukit/include/rtems/libio.h<br>
> @@ -11,7 +11,7 @@<br>
> */<br>
><br>
> /*<br>
> - * COPYRIGHT (c) 1989-2008.<br>
> + * COPYRIGHT (c) 1989-2008, 2021.<br>
> * On-Line Applications Research Corporation (OAR).<br>
> *<br>
> * Modifications to support reference counting in the file system are<br>
> @@ -375,18 +375,16 @@ typedef int (*rtems_filesystem_rmnod_t)(<br>
> * @brief Set node access and modification times.<br>
> *<br>
> * @param[in] loc The location of the node.<br>
> - * @param[in] actime Access time for the node.<br>
> - * @param[in] modtime Modification for the node.<br>
> + * @param[in] times Access and modification times for the node<br>
> *<br>
> * @retval 0 Successful operation.<br>
> * @retval -1 An error occurred. The errno is set to indicate the error.<br>
> *<br>
> - * @see rtems_filesystem_default_utime().<br>
> + * @see rtems_filesystem_default_utimens().<br>
> */<br>
> -typedef int (*rtems_filesystem_utime_t)(<br>
> +typedef int (*rtems_filesystem_utimens_t)(<br>
> const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> + struct timespec times[2]<br>
> );<br>
><br>
> /**<br>
> @@ -484,7 +482,7 @@ struct _rtems_filesystem_operations_table {<br>
> rtems_filesystem_mount_t mount_h;<br>
> rtems_filesystem_unmount_t unmount_h;<br>
> rtems_filesystem_fsunmount_me_t fsunmount_me_h;<br>
> - rtems_filesystem_utime_t utime_h;<br>
> + rtems_filesystem_utimens_t utimens_h;<br>
> rtems_filesystem_symlink_t symlink_h;<br>
> rtems_filesystem_readlink_t readlink_h;<br>
> rtems_filesystem_rename_t rename_h;<br>
> @@ -644,12 +642,11 @@ void rtems_filesystem_default_fsunmount(<br>
> /**<br>
> * @retval -1 Always. The errno is set to ENOTSUP.<br>
> *<br>
> - * @see rtems_filesystem_utime_t.<br>
> + * @see rtems_filesystem_utimens_t.<br>
> */<br>
> -int rtems_filesystem_default_utime(<br>
> +int rtems_filesystem_default_utimens(<br>
> const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> + struct timespec times[2]<br>
> );<br>
><br>
> /**<br>
> diff --git a/cpukit/libcsupport/src/__usrenv.c b/cpukit/libcsupport/src/__usrenv.c<br>
> index 5c25eaa..13b5700 100644<br>
> --- a/cpukit/libcsupport/src/__usrenv.c<br>
> +++ b/cpukit/libcsupport/src/__usrenv.c<br>
> @@ -6,7 +6,7 @@<br>
> */<br>
><br>
> /*<br>
> - * COPYRIGHT (c) 1989-2008.<br>
> + * COPYRIGHT (c) 1989-2008, 2021.<br>
> * On-Line Applications Research Corporation (OAR).<br>
> *<br>
> * Modifications to support reference counting in the file system are<br>
> @@ -145,10 +145,9 @@ static void null_op_fsunmount_me(<br>
> /* Do nothing */<br>
> }<br>
><br>
> -static int null_op_utime(<br>
> +static int null_op_utimens(<br>
> const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> + struct timespec times[2]<br>
> )<br>
> {<br>
> return -1;<br>
> @@ -207,7 +206,7 @@ static const rtems_filesystem_operations_table null_ops = {<br>
> .mount_h = null_op_mount,<br>
> .unmount_h = null_op_unmount,<br>
> .fsunmount_me_h = null_op_fsunmount_me,<br>
> - .utime_h = null_op_utime,<br>
> + .utimens_h = null_op_utimens,<br>
> .symlink_h = null_op_symlink,<br>
> .readlink_h = null_op_readlink,<br>
> .rename_h = null_op_rename,<br>
> diff --git a/cpukit/libfs/src/defaults/default_ops.c b/cpukit/libfs/src/defaults/default_ops.c<br>
> index 63ad2ce..de317a2 100644<br>
> --- a/cpukit/libfs/src/defaults/default_ops.c<br>
> +++ b/cpukit/libfs/src/defaults/default_ops.c<br>
> @@ -36,7 +36,7 @@ const rtems_filesystem_operations_table rtems_filesystem_operations_default = {<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = rtems_filesystem_default_fsunmount,<br>
> - .utime_h = rtems_filesystem_default_utime,<br>
> + .utimens_h = rtems_filesystem_default_utimens,<br>
> .symlink_h = rtems_filesystem_default_symlink,<br>
> .readlink_h = rtems_filesystem_default_readlink,<br>
> .rename_h = rtems_filesystem_default_rename,<br>
> diff --git a/cpukit/libfs/src/defaults/default_utime.c b/cpukit/libfs/src/defaults/default_utime.c<br>
> deleted file mode 100644<br>
> index aaf4e44..0000000<br>
> --- a/cpukit/libfs/src/defaults/default_utime.c<br>
> +++ /dev/null<br>
> @@ -1,32 +0,0 @@<br>
> -/**<br>
> - * @file<br>
> - *<br>
> - * @ingroup LibIOFSOps File System Operations<br>
> - *<br>
> - * @brief RTEMS Default File System sets file access and modification times<br>
> - */<br>
> -<br>
> -/*<br>
> - * COPYRIGHT (c) 2010.<br>
> - * On-Line Applications Research Corporation (OAR).<br>
> - *<br>
> - * The license and distribution terms for this file may be<br>
> - * found in the file LICENSE in this distribution or at<br>
> - * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a>.<br>
> - */<br>
> -<br>
> -#ifdef HAVE_CONFIG_H<br>
> -#include "config.h"<br>
> -#endif<br>
> -<br>
> -#include <rtems/libio_.h><br>
> -#include <rtems/seterr.h><br>
> -<br>
> -int rtems_filesystem_default_utime(<br>
> - const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> -)<br>
> -{<br>
> - rtems_set_errno_and_return_minus_one( ENOTSUP );<br>
> -}<br>
> diff --git a/cpukit/libfs/src/defaults/default_utimens.c b/cpukit/libfs/src/defaults/default_utimens.c<br>
> new file mode 100644<br>
> index 0000000..f71c156<br>
> --- /dev/null<br>
> +++ b/cpukit/libfs/src/defaults/default_utimens.c<br>
> @@ -0,0 +1,33 @@<br>
> +/* SPDX-License-Identifier: BSD-2-Clause */<br>
> +<br>
> +/**<br>
> + * @file<br>
> + *<br>
> + * @ingroup LibIOFSOps File System Operations<br>
> + *<br>
> + * @brief RTEMS Default File System sets file access and modification times<br>
> + */<br>
> +<br>
> +/*<br>
> + * COPYRIGHT (c) 2010, 2021.<br>
> + * On-Line Applications Research Corporation (OAR).<br>
> + *<br>
> + * The license and distribution terms for this file may be<br>
> + * found in the file LICENSE in this distribution or at<br>
> + * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a>.<br>
> + */<br>
> +<br>
> +#ifdef HAVE_CONFIG_H<br>
> +#include "config.h"<br>
> +#endif<br>
> +<br>
> +#include <rtems/libio_.h><br>
> +#include <rtems/seterr.h><br>
> +<br>
> +int rtems_filesystem_default_utimens(<br>
> + const rtems_filesystem_location_info_t *loc,<br>
> + struct timespec times[2]<br>
> +)<br>
> +{<br>
> + rtems_set_errno_and_return_minus_one( ENOTSUP );<br>
> +}<br>
> diff --git a/cpukit/libfs/src/dosfs/msdos_init.c b/cpukit/libfs/src/dosfs/msdos_init.c<br>
> index 67b16b6..a96b973 100644<br>
> --- a/cpukit/libfs/src/dosfs/msdos_init.c<br>
> +++ b/cpukit/libfs/src/dosfs/msdos_init.c<br>
> @@ -36,18 +36,17 @@ static int msdos_clone_node_info(rtems_filesystem_location_info_t *loc)<br>
> return fat_file_reopen(fat_fd);<br>
> }<br>
><br>
> -static int msdos_utime(<br>
> +static int msdos_utimens(<br>
> const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> + struct timespec times[2]<br>
> )<br>
> {<br>
> fat_file_fd_t *fat_fd = loc->node_access;<br>
><br>
> - if (actime != modtime)<br>
> + if (times[0].tv_sec != times[1].tv_sec)<br>
> rtems_set_errno_and_return_minus_one( ENOTSUP );<br>
><br>
> - fat_file_set_mtime(fat_fd, modtime);<br>
> + fat_file_set_mtime(fat_fd, times[1].tv_sec);<br>
><br>
> return RC_OK;<br>
> }<br>
> @@ -67,7 +66,7 @@ const rtems_filesystem_operations_table msdos_ops = {<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = msdos_shut_down,<br>
> - .utime_h = msdos_utime,<br>
> + .utimens_h = msdos_utimens,<br>
> .symlink_h = rtems_filesystem_default_symlink,<br>
> .readlink_h = rtems_filesystem_default_readlink,<br>
> .rename_h = msdos_rename,<br>
> diff --git a/cpukit/libfs/src/ftpfs/ftpfs.c b/cpukit/libfs/src/ftpfs/ftpfs.c<br>
> index 5e0cb95..a0ee0fa 100644<br>
> --- a/cpukit/libfs/src/ftpfs/ftpfs.c<br>
> +++ b/cpukit/libfs/src/ftpfs/ftpfs.c<br>
> @@ -1384,7 +1384,7 @@ static const rtems_filesystem_operations_table rtems_ftpfs_ops = {<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = rtems_ftpfs_unmount_me,<br>
> - .utime_h = rtems_filesystem_default_utime,<br>
> + .utimens_h = rtems_filesystem_default_utimens,<br>
> .symlink_h = rtems_filesystem_default_symlink,<br>
> .readlink_h = rtems_filesystem_default_readlink,<br>
> .rename_h = rtems_filesystem_default_rename,<br>
> diff --git a/cpukit/libfs/src/ftpfs/tftpDriver.c b/cpukit/libfs/src/ftpfs/tftpDriver.c<br>
> index 7cbb402..bc0e74a 100644<br>
> --- a/cpukit/libfs/src/ftpfs/tftpDriver.c<br>
> +++ b/cpukit/libfs/src/ftpfs/tftpDriver.c<br>
> @@ -1039,7 +1039,7 @@ static const rtems_filesystem_operations_table rtems_tftp_ops = {<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = rtems_tftpfs_shutdown,<br>
> - .utime_h = rtems_filesystem_default_utime,<br>
> + .utimens_h = rtems_filesystem_default_utimens,<br>
> .symlink_h = rtems_filesystem_default_symlink,<br>
> .readlink_h = rtems_filesystem_default_readlink,<br>
> .rename_h = rtems_filesystem_default_rename,<br>
> diff --git a/cpukit/libfs/src/imfs/imfs_init.c b/cpukit/libfs/src/imfs/imfs_init.c<br>
> index 1b9b769..5b8d3dd 100644<br>
> --- a/cpukit/libfs/src/imfs/imfs_init.c<br>
> +++ b/cpukit/libfs/src/imfs/imfs_init.c<br>
> @@ -7,7 +7,7 @@<br>
> */<br>
><br>
> /*<br>
> - * COPYRIGHT (c) 1989-1999.<br>
> + * COPYRIGHT (c) 1989-1999, 2021.<br>
> * On-Line Applications Research Corporation (OAR).<br>
> *<br>
> * The license and distribution terms for this file may be<br>
> @@ -40,7 +40,7 @@ static const rtems_filesystem_operations_table IMFS_ops = {<br>
> .mount_h = IMFS_mount,<br>
> .unmount_h = IMFS_unmount,<br>
> .fsunmount_me_h = IMFS_fsunmount,<br>
> - .utime_h = IMFS_utime,<br>
> + .utimens_h = IMFS_utimens,<br>
> .symlink_h = IMFS_symlink,<br>
> .readlink_h = IMFS_readlink,<br>
> .rename_h = IMFS_rename,<br>
> diff --git a/cpukit/libfs/src/imfs/imfs_utime.c b/cpukit/libfs/src/imfs/imfs_utime.c<br>
> deleted file mode 100644<br>
> index 21e5139..0000000<br>
> --- a/cpukit/libfs/src/imfs/imfs_utime.c<br>
> +++ /dev/null<br>
> @@ -1,41 +0,0 @@<br>
> -/**<br>
> - * @file<br>
> - *<br>
> - * @ingroup IMFS<br>
> - *<br>
> - * @brief Set IMFS File Access and Modification Times<br>
> - */<br>
> -<br>
> -/*<br>
> - * COPYRIGHT (c) 1989-1999.<br>
> - * On-Line Applications Research Corporation (OAR).<br>
> - *<br>
> - * The license and distribution terms for this file may be<br>
> - * found in the file LICENSE in this distribution or at<br>
> - * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a>.<br>
> - */<br>
> -<br>
> -#ifdef HAVE_CONFIG_H<br>
> -#include "config.h"<br>
> -#endif<br>
> -<br>
> -#include <rtems/imfs.h><br>
> -<br>
> -#include <sys/time.h><br>
> -<br>
> -int IMFS_utime(<br>
> - const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> -)<br>
> -{<br>
> - IMFS_jnode_t *the_jnode;<br>
> -<br>
> - the_jnode = (IMFS_jnode_t *) loc->node_access;<br>
> -<br>
> - the_jnode->stat_atime = actime;<br>
> - the_jnode->stat_mtime = modtime;<br>
> - the_jnode->stat_ctime = time( NULL );<br>
> -<br>
> - return 0;<br>
> -}<br>
> diff --git a/cpukit/libfs/src/imfs/imfs_utimens.c b/cpukit/libfs/src/imfs/imfs_utimens.c<br>
> new file mode 100644<br>
> index 0000000..92f2528<br>
> --- /dev/null<br>
> +++ b/cpukit/libfs/src/imfs/imfs_utimens.c<br>
> @@ -0,0 +1,42 @@<br>
> +/* SPDX-License-Identifier: BSD-2-Clause */<br>
> +<br>
> +/**<br>
> + * @file<br>
> + *<br>
> + * @ingroup IMFS<br>
> + *<br>
> + * @brief Set IMFS File Access and Modification Times<br>
> + */<br>
> +<br>
> +/*<br>
> + * COPYRIGHT (c) 1989-1999, 2021.<br>
> + * On-Line Applications Research Corporation (OAR).<br>
> + *<br>
> + * The license and distribution terms for this file may be<br>
> + * found in the file LICENSE in this distribution or at<br>
> + * <a href="http://www.rtems.org/license/LICENSE" rel="noreferrer" target="_blank">http://www.rtems.org/license/LICENSE</a>.<br>
> + */<br>
Update license? (This doesn't match the SPDX...)<br></blockquote><div><br></div><div>Good catch. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> +<br>
> +#ifdef HAVE_CONFIG_H<br>
> +#include "config.h"<br>
> +#endif<br>
> +<br>
> +#include <rtems/imfs.h><br>
> +<br>
> +#include <sys/time.h><br>
> +<br>
> +int IMFS_utimens(<br>
> + const rtems_filesystem_location_info_t *loc,<br>
> + struct timespec times[2]<br>
> +)<br>
> +{<br>
> + IMFS_jnode_t *the_jnode;<br>
> +<br>
> + the_jnode = (IMFS_jnode_t *) loc->node_access;<br>
> +<br>
> + the_jnode->stat_atime = times[0].tv_sec;<br>
> + the_jnode->stat_mtime = times[1].tv_sec;<br>
> + the_jnode->stat_ctime = time( NULL );<br>
> +<br>
> + return 0;<br>
> +}<br>
> diff --git a/cpukit/libfs/src/jffs2/src/fs-rtems.c b/cpukit/libfs/src/jffs2/src/fs-rtems.c<br>
> index aae208c..8bc3d85 100644<br>
> --- a/cpukit/libfs/src/jffs2/src/fs-rtems.c<br>
> +++ b/cpukit/libfs/src/jffs2/src/fs-rtems.c<br>
> @@ -1118,10 +1118,9 @@ static int rtems_jffs2_statvfs(<br>
> return 0;<br>
> }<br>
><br>
> -static int rtems_jffs2_utime(<br>
> +static int rtems_jffs2_utimens(<br>
> const rtems_filesystem_location_info_t *loc,<br>
> - time_t actime,<br>
> - time_t modtime<br>
> + struct timespec times[2]<br>
> )<br>
> {<br>
> struct _inode *inode = rtems_jffs2_get_inode_by_location(loc);<br>
> @@ -1129,8 +1128,8 @@ static int rtems_jffs2_utime(<br>
> int eno;<br>
><br>
> iattr.ia_valid = ATTR_ATIME | ATTR_MTIME | ATTR_CTIME;<br>
> - iattr.ia_atime = actime;<br>
> - iattr.ia_mtime = modtime;<br>
> + iattr.ia_atime = times[0].tv_sec;<br>
> + iattr.ia_mtime = times[1].tv_sec;<br>
> iattr.ia_ctime = get_seconds();<br>
><br>
> eno = -jffs2_do_setattr(inode, &iattr);<br>
> @@ -1186,7 +1185,7 @@ static const rtems_filesystem_operations_table rtems_jffs2_ops = {<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = rtems_jffs2_fsunmount,<br>
> - .utime_h = rtems_jffs2_utime,<br>
> + .utimens_h = rtems_jffs2_utimens,<br>
> .symlink_h = rtems_jffs2_symlink,<br>
> .readlink_h = rtems_jffs2_readlink,<br>
> .rename_h = rtems_jffs2_rename,<br>
> diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c<br>
> index 35db9ee..0efab2c 100644<br>
> --- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c<br>
> +++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c<br>
> @@ -296,16 +296,14 @@ rtems_rfs_rtems_chown (const rtems_filesystem_location_info_t *pathloc,<br>
> * This routine is the implementation of the utime() system call for the<br>
> * RFS.<br>
> *<br>
> - * @param pathloc<br>
> - * @param atime<br>
> - * @param mtime<br>
> + * @param pathloc The path to the file to be modified<br>
> + * @param times The times to update the file to<br>
> * return int<br>
> */<br>
><br>
> static int<br>
> -rtems_rfs_rtems_utime(const rtems_filesystem_location_info_t* pathloc,<br>
> - time_t atime,<br>
> - time_t mtime)<br>
> +rtems_rfs_rtems_utimens(const rtems_filesystem_location_info_t* pathloc,<br>
> + struct timespec times[2])<br>
> {<br>
> rtems_rfs_file_system* fs = rtems_rfs_rtems_pathloc_dev (pathloc);<br>
> rtems_rfs_ino ino = rtems_rfs_rtems_get_pathloc_ino (pathloc);<br>
> @@ -318,8 +316,8 @@ rtems_rfs_rtems_utime(const rtems_filesystem_location_info_t* pathloc,<br>
> return rtems_rfs_rtems_error ("utime: read inode", rc);<br>
> }<br>
><br>
> - rtems_rfs_inode_set_atime (&inode, atime);<br>
> - rtems_rfs_inode_set_mtime (&inode, mtime);<br>
> + rtems_rfs_inode_set_atime (&inode, times[0].tv_sec);<br>
> + rtems_rfs_inode_set_mtime (&inode, times[1].tv_sec);<br>
><br>
> rc = rtems_rfs_inode_close (fs, &inode);<br>
> if (rc)<br>
> @@ -735,7 +733,7 @@ const rtems_filesystem_operations_table rtems_rfs_ops =<br>
> .mount_h = rtems_filesystem_default_mount,<br>
> .unmount_h = rtems_filesystem_default_unmount,<br>
> .fsunmount_me_h = rtems_rfs_rtems_shutdown,<br>
> - .utime_h = rtems_rfs_rtems_utime,<br>
> + .utimens_h = rtems_rfs_rtems_utimens,<br>
> .symlink_h = rtems_rfs_rtems_symlink,<br>
> .readlink_h = rtems_rfs_rtems_readlink,<br>
> .rename_h = rtems_rfs_rtems_rename,<br>
<br>
Which filesystems have been tested with this change?<br></blockquote><div><br></div><div>All that are covered by rtems.git itself and fstests. I was hoping someone</div><div>who already had an NFS setup could test the mechanical changes to rtems-libbsd</div><div>and the legacy network. Neither Ryan nor I have an NFS server setup to</div><div>test against.</div><div><br></div><div>He has done coverage testing as well.</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml<br>
> index 9639051..6df98c9 100644<br>
> --- a/spec/build/cpukit/librtemscpu.yml<br>
> +++ b/spec/build/cpukit/librtemscpu.yml<br>
> @@ -804,7 +804,7 @@ source:<br>
> - cpukit/libfs/src/defaults/default_statvfs.c<br>
> - cpukit/libfs/src/defaults/default_symlink.c<br>
> - cpukit/libfs/src/defaults/default_unmount.c<br>
> -- cpukit/libfs/src/defaults/default_utime.c<br>
> +- cpukit/libfs/src/defaults/default_utimens.c<br>
> - cpukit/libfs/src/defaults/default_write.c<br>
> - cpukit/libfs/src/defaults/default_writev.c<br>
> - cpukit/libfs/src/dosfs/fat.c<br>
> @@ -861,7 +861,7 @@ source:<br>
> - cpukit/libfs/src/imfs/imfs_stat_file.c<br>
> - cpukit/libfs/src/imfs/imfs_symlink.c<br>
> - cpukit/libfs/src/imfs/imfs_unmount.c<br>
> -- cpukit/libfs/src/imfs/imfs_utime.c<br>
> +- cpukit/libfs/src/imfs/imfs_utimens.c<br>
> - cpukit/libfs/src/imfs/ioman.c<br>
> - cpukit/libfs/src/pipe/fifo.c<br>
> - cpukit/libfs/src/pipe/pipe.c<br>
> --<br>
> 1.8.3.1<br>
><br>
> _______________________________________________<br>
> devel mailing list<br>
> <a href="mailto:devel@rtems.org" target="_blank">devel@rtems.org</a><br>
> <a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div></div>