From patchwork Thu Jun 3 15:16:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sripathi Kodi X-Patchwork-Id: 54490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 97EE5B7D51 for ; Fri, 4 Jun 2010 01:18:25 +1000 (EST) Received: from localhost ([127.0.0.1]:50136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKCBa-0005c7-O6 for incoming@patchwork.ozlabs.org; Thu, 03 Jun 2010 11:18:22 -0400 Received: from [140.186.70.92] (port=43047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKCAL-0005at-DF for qemu-devel@nongnu.org; Thu, 03 Jun 2010 11:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKCAH-0004S7-5y for qemu-devel@nongnu.org; Thu, 03 Jun 2010 11:17:05 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:52112) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKCAG-0004RO-M4 for qemu-devel@nongnu.org; Thu, 03 Jun 2010 11:17:01 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp09.au.ibm.com (8.14.4/8.13.1) with ESMTP id o53FGtwH022883 for ; Fri, 4 Jun 2010 01:16:55 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o53FGvqu1560772 for ; Fri, 4 Jun 2010 01:16:58 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o53FGvZQ010558 for ; Fri, 4 Jun 2010 01:16:57 +1000 Received: from sripathi.in.ibm.com ([9.124.35.92]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o53FGuYm010554; Fri, 4 Jun 2010 01:16:57 +1000 Received: from localhost.localdomain (localhost [IPv6:::1]) by sripathi.in.ibm.com (Postfix) with ESMTP id 28E15B3A49; Thu, 3 Jun 2010 20:46:56 +0530 (IST) From: Sripathi Kodi To: qemu-devel@nongnu.org Date: Thu, 03 Jun 2010 20:46:56 +0530 Message-ID: <20100603151656.23589.5455.stgit@localhost.localdomain> In-Reply-To: <20100603151540.23589.77918.stgit@localhost.localdomain> References: <20100603151540.23589.77918.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: v9fs-developer@lists.sourceforge.net Subject: [Qemu-devel] [PATCH 1/2] Make v9fs_do_utimensat accept timespec structures instead of v9stat. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org One of Mohan's recent patches (Message-Id: <1275286613-16757-1-git-send-email-mohan@in.ibm.com>) implements v9fs_do_utimensat function. Currently v9fs_do_utimensat takes a V9fsStat argument and builds timespec structures. It sets tv_nsec values to 0 by default. Instead of this it should take struct timespec[2] and pass it down to the system directly. This will make it more generic and useful elsewhere. Signed-off-by: Sripathi Kodi --- hw/virtio-9p.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index 1c7a428..8c1cdfb 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -239,25 +239,10 @@ 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_utimensat(V9fsState *s, V9fsString *path, V9fsStat v9stat) +static int v9fs_do_utimensat(V9fsState *s, V9fsString *path, + const struct timespec times[2]) { - 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); + return s->ops->utimensat(&s->ctx, path->data, times); } static int v9fs_do_remove(V9fsState *s, V9fsString *path) @@ -2345,7 +2330,21 @@ static void v9fs_wstat_post_chmod(V9fsState *s, V9fsWstatState *vs, int err) } if (vs->v9stat.mtime != -1 || vs->v9stat.atime != -1) { - if (v9fs_do_utimensat(s, &vs->fidp->path, vs->v9stat)) { + struct timespec times[2]; + if (vs->v9stat.atime != -1) { + times[0].tv_sec = vs->v9stat.atime; + times[0].tv_nsec = 0; + } else { + times[0].tv_nsec = UTIME_OMIT; + } + if (vs->v9stat.mtime != -1) { + times[1].tv_sec = vs->v9stat.mtime; + times[1].tv_nsec = 0; + } else { + times[1].tv_nsec = UTIME_OMIT; + } + + if (v9fs_do_utimensat(s, &vs->fidp->path, times)) { err = -errno; } }