From patchwork Tue Dec 20 02:51:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9481059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6BF8B606DB for ; Tue, 20 Dec 2016 02:51:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BAA028479 for ; Tue, 20 Dec 2016 02:51:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CAD9284D3; Tue, 20 Dec 2016 02:51:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 872C328479 for ; Tue, 20 Dec 2016 02:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754151AbcLTCvc (ORCPT ); Mon, 19 Dec 2016 21:51:32 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33985 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754097AbcLTCvb (ORCPT ); Mon, 19 Dec 2016 21:51:31 -0500 Received: by mail-pg0-f65.google.com with SMTP id b1so10138663pgc.1 for ; Mon, 19 Dec 2016 18:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kUAlxxCc4lsUEi87FnVM6l7PLdD0ft+D072UnEfsSNU=; b=LKRL2wJLY/5aQDUpUYTWcm9rod0W6ilBdhlXrmy77dq5H4t/Am0v/mfeVPuZqHnaxX JoQZHePdEQXkqIMbhMdM/ahdgL7EM9y2/UdvSTLCARj0ZtCkfngdrA8+RODzZIsw0Ydi flk2APcxA8SQRAya+WIm1TAJcpUaX2XT3uPpSMGgCjprgSnI/2Oa0hY/rJSdPo85uwLI 94zf6tfzBxjXaAL8VMx/zL7fgrOf229aLYkVxCn0pQb2lH3qkUZkXbNTkVNGEF8LxUY8 TiTTEUfYAwfbdSGhIz7WM1d0K/rUMKBqxOv2Ddvhe6NjfJXeT26ZRJlVooXQn0FO+OQn oaJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kUAlxxCc4lsUEi87FnVM6l7PLdD0ft+D072UnEfsSNU=; b=UnIGwtqFMymSLYLyznfc1q151YKUetlyeSu4SdF2xQI3Tpx2Nob4bkm7iOPx5DMOZp oe6TUtdNCKz3GZb4tffqD1p3Xd7osoUgqkY6rtCCq5ErvQCo6waNH4vX8DfSdiSUG7FH VFwciQh41DIz27PO9aQ/4PSGc+ARwYB1AG3rBH0+Ejztl7eViuwaOVOncBH7GPoIQK/x 2eMzsfmqmj73vmMkEi14nIxMyowBGKNEbFKQmJ2K6isOrhHHZN63KfTEIEHn8nRIy048 r8W2KfzampcUSkt+6/C5HO4UYijwYLPyqdXQWhzke8ajPzX5HBwj5ezQw1uMve0uQ8Vu PYMg== X-Gm-Message-State: AKaTC00gT7a68Uyuy+HTE+/6SyEjcMTJ96LM3DVVGG4xAl7C8mMpyPmOVbxW93n+q8ELug== X-Received: by 10.98.32.151 with SMTP id m23mr17375721pfj.127.1482202290628; Mon, 19 Dec 2016 18:51:30 -0800 (PST) Received: from deepa-ubuntu.hsd1.ca.comcast.net ([2601:647:5000:6620:bdf4:312e:f1bc:d2ef]) by smtp.gmail.com with ESMTPSA id a26sm1327457pgd.26.2016.12.19.18.51.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Dec 2016 18:51:30 -0800 (PST) From: Deepa Dinamani To: linux-xfs@vger.kernel.org Cc: arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v2] xfs_io: implement 'utimes' command Date: Mon, 19 Dec 2016 18:51:26 -0800 Message-Id: <1482202286-8390-1-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the utimes command to provide a way to utilize the futimens C library call. This is the interface to the utimensat system call, which updates the mtime and atime of a file. Signed-off-by: Deepa Dinamani Reviewed-by: Eric Sandeen --- Changes since v1: * changed error return values * removed redundant roff formatting directive * removed unneeded argument count check include/input.h | 1 + io/Makefile | 2 +- io/init.c | 1 + io/io.h | 1 + io/utimes.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ libxcmd/input.c | 22 +++++++++++++++ man/man8/xfs_io.8 | 11 ++++++++ 7 files changed, 118 insertions(+), 1 deletion(-) create mode 100755 io/utimes.c mode change 100644 => 100755 libxcmd/input.c diff --git a/include/input.h b/include/input.h index d02170f..221678e 100644 --- a/include/input.h +++ b/include/input.h @@ -48,6 +48,7 @@ extern uid_t uid_from_string(char *user); extern gid_t gid_from_string(char *group); extern prid_t prid_from_string(char *project); extern bool isdigits_only(const char *str); +extern int timespec_from_string(const char *sec, const char *nsec, struct timespec *ts); #define HAVE_FTW_H 1 /* TODO: configure me */ diff --git a/io/Makefile b/io/Makefile index 62bc03b..392e02a 100644 --- a/io/Makefile +++ b/io/Makefile @@ -11,7 +11,7 @@ HFILES = init.h io.h CFILES = init.c \ attr.c bmap.c file.c freeze.c fsync.c getrusage.c imap.c link.c \ mmap.c open.c parent.c pread.c prealloc.c pwrite.c seek.c shutdown.c \ - sync.c truncate.c reflink.c + sync.c truncate.c reflink.c utimes.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) diff --git a/io/init.c b/io/init.c index efe7390..6319aeb 100644 --- a/io/init.c +++ b/io/init.c @@ -85,6 +85,7 @@ init_commands(void) sync_range_init(); truncate_init(); reflink_init(); + utimes_init(); } static int diff --git a/io/io.h b/io/io.h index 2bc7ac4..fddd7a3 100644 --- a/io/io.h +++ b/io/io.h @@ -113,6 +113,7 @@ extern void seek_init(void); extern void shutdown_init(void); extern void sync_init(void); extern void truncate_init(void); +extern void utimes_init(void); #ifdef HAVE_FADVISE extern void fadvise_init(void); diff --git a/io/utimes.c b/io/utimes.c new file mode 100755 index 0000000..faf9b8d --- /dev/null +++ b/io/utimes.c @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2016 Deepa Dinamani + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "command.h" +#include "input.h" +#include "init.h" +#include "io.h" + +static cmdinfo_t utimes_cmd; + +static void +utimes_help(void) +{ + printf(_( +"\n" +" Update file atime and mtime of the current file with nansecond precision.\n" +"\n" +" Usage: utimes atime_sec atime_nsec mtime_sec mtime_nsec.\n" +" *_sec: Seconds elapsed since 1970-01-01 00:00:00 UTC.\n" +" *_nsec: Nanoseconds since the corresponding *_sec.\n" +"\n")); +} + +static int +utimes_f( + int argc, + char **argv) +{ + struct timespec t[2]; + int result; + + /* Get the timestamps */ + result = timespec_from_string(argv[1], argv[2], &t[0]); + if (result) { + fprintf(stderr, "Bad value for atime\n"); + return 0; + } + result = timespec_from_string(argv[3], argv[4], &t[1]); + if (result) { + fprintf(stderr, "Bad value for mtime\n"); + return 0; + } + + /* Call futimens to update time. */ + if (futimens(file->fd, t)) { + perror("futimens"); + return 0; + } + + return 0; +} + +void +utimes_init(void) +{ + utimes_cmd.name = "utimes"; + utimes_cmd.cfunc = utimes_f; + utimes_cmd.argmin = 4; + utimes_cmd.argmax = 4; + utimes_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + utimes_cmd.args = _("atime_sec atime_nsec mtime_sec mtime_nsec"); + utimes_cmd.oneline = _("Update file times of the current file"); + utimes_cmd.help = utimes_help; + + add_command(&utimes_cmd); +} diff --git a/libxcmd/input.c b/libxcmd/input.c old mode 100644 new mode 100755 index 5a7dce3..8aeb3b0 --- a/libxcmd/input.c +++ b/libxcmd/input.c @@ -327,6 +327,28 @@ timestr( } /* + * Convert from a pair of arbitrary user strings into a timespec. + */ + +int +timespec_from_string( + const char * secs, + const char * nsecs, + struct timespec * ts) +{ + char* p; + if (!secs || !nsecs || !ts) + return 1; + ts->tv_sec = strtoull(secs, &p, 0); + if (*p) + return 1; + ts->tv_nsec = strtoull(nsecs, &p, 0); + if (*p) + return 1; + return 0; +} + +/* * Convert from arbitrary user strings into a numeric ID. * If it's all numeric, we convert that inplace, else we do * the name lookup, and return the found identifier. diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 2c56f09..9efb7b2 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -589,6 +589,16 @@ Copy data into the open file beginning at Copy up to .I length bytes of data. +.RE +.PD +.TP +.BI utimes " atime_sec atime_nsec mtime_sec mtime_nsec" +The utimes command changes the atime and mtime of the current file. +sec uses UNIX timestamp notation and is the seconds elapsed since +1970-01-01 00:00:00 UTC. +nsec is the nanoseconds since the sec. This value needs to be in +the range 0-999999999 with UTIME_NOW and UTIME_OMIT being exceptions. +Each (sec, nsec) pair constitutes a single timestamp value. .SH MEMORY MAPPED I/O COMMANDS .TP @@ -875,6 +885,7 @@ verbose output will be printed. .BR fstatfs (2), .BR fsync (2), .BR ftruncate (2), +.BR futimens (3), .BR mmap (2), .BR msync (2), .BR open (2),