From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43545 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OrFTB-0004D6-CG for qemu-devel@nongnu.org; Thu, 02 Sep 2010 15:29:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OrFTA-0004bL-4w for qemu-devel@nongnu.org; Thu, 02 Sep 2010 15:29:09 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:60536) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OrFT9-0004bA-Mi for qemu-devel@nongnu.org; Thu, 02 Sep 2010 15:29:08 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e38.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o82JLcQG021933 for ; Thu, 2 Sep 2010 13:21:38 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o82JT78N098188 for ; Thu, 2 Sep 2010 13:29:07 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o82JT4P1021263 for ; Thu, 2 Sep 2010 13:29:05 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Thu, 2 Sep 2010 12:39:27 -0700 Message-Id: <1283456388-13083-8-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1283456388-13083-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1283456388-13083-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V5 07/28] virtio-9p: Do not reset atime List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "M. Mohan Kumar" , Venkateswararao Jujjuri From: M. Mohan Kumar Current code resets file's atime to 0 when there is a change in mtime. This results in resetting the atime to "1970-01-01 05:30:00". For example, truncate -s 0 filename results in changing the mtime to the truncate time, but resets the atime to "1970-01-01 05:30:00". utime system call does not have any provision to set only mtime or atime. So change v9fs_wstat_post_chmod function to use utimensat function to change the atime and mtime fields. If tv_nsec field is set to the special value "UTIME_OMIT", corresponding file time stamp is not updated. Signed-off-by: M. Mohan Kumar Signed-off-by: Venkateswararao Jujjuri --- hw/file-op-9p.h | 2 +- hw/virtio-9p-local.c | 8 ++++---- hw/virtio-9p.c | 28 ++++++++++++++++++++-------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index dd82ac7..120c803 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -52,7 +52,7 @@ typedef struct FileOperations int (*chmod)(FsContext *, const char *, FsCred *); int (*chown)(FsContext *, const char *, FsCred *); int (*mknod)(FsContext *, const char *, FsCred *); - int (*utime)(FsContext *, const char *, const struct utimbuf *); + int (*utimensat)(FsContext *, const char *, const struct timespec *); int (*remove)(FsContext *, const char *); int (*symlink)(FsContext *, const char *, const char *, FsCred *); int (*link)(FsContext *, const char *, const char *); diff --git a/hw/virtio-9p-local.c b/hw/virtio-9p-local.c index 82f41c6..dd7277b 100644 --- a/hw/virtio-9p-local.c +++ b/hw/virtio-9p-local.c @@ -450,10 +450,10 @@ static int local_chown(FsContext *fs_ctx, const char *path, FsCred *credp) return -1; } -static int local_utime(FsContext *ctx, const char *path, - const struct utimbuf *buf) +static int local_utimensat(FsContext *s, const char *path, + const struct timespec *buf) { - return utime(rpath(ctx, path), buf); + return utimensat(AT_FDCWD, rpath(s, path), buf, AT_SYMLINK_NOFOLLOW); } static int local_remove(FsContext *ctx, const char *path) @@ -495,7 +495,7 @@ FileOperations local_ops = { .truncate = local_truncate, .rename = local_rename, .chown = local_chown, - .utime = local_utime, + .utimensat = local_utimensat, .remove = local_remove, .fsync = local_fsync, .statfs = local_statfs, diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index a8f1735..bd6cba9 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -237,10 +237,25 @@ static int v9fs_do_chown(V9fsState *s, V9fsString *path, uid_t uid, gid_t gid) return s->ops->chown(&s->ctx, path->data, &cred); } -static int v9fs_do_utime(V9fsState *s, V9fsString *path, - const struct utimbuf *buf) +static int v9fs_do_utimensat(V9fsState *s, V9fsString *path, V9fsStat v9stat) { - return s->ops->utime(&s->ctx, path->data, buf); + struct timespec ts[2]; + + if (v9stat.atime != -1) { + ts[0].tv_sec = v9stat.atime; + ts[0].tv_nsec = 0; + } else { + ts[0].tv_nsec = UTIME_OMIT; + } + + if (v9stat.mtime != -1) { + ts[1].tv_sec = v9stat.mtime; + ts[1].tv_nsec = 0; + } else { + ts[1].tv_nsec = UTIME_OMIT; + } + + return s->ops->utimensat(&s->ctx, path->data, ts); } static int v9fs_do_remove(V9fsState *s, V9fsString *path) @@ -2325,11 +2340,8 @@ static void v9fs_wstat_post_chmod(V9fsState *s, V9fsWstatState *vs, int err) goto out; } - if (vs->v9stat.mtime != -1) { - struct utimbuf tb; - tb.actime = 0; - tb.modtime = vs->v9stat.mtime; - if (v9fs_do_utime(s, &vs->fidp->path, &tb)) { + if (vs->v9stat.mtime != -1 || vs->v9stat.atime != -1) { + if (v9fs_do_utimensat(s, &vs->fidp->path, vs->v9stat)) { err = -errno; } } -- 1.6.5.2