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: 104111 X-Patchwork-Delegate: ericvh@gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o53FHKBB011654 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 3 Jun 2010 15:17:56 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OKCAV-0003vy-GJ; Thu, 03 Jun 2010 15:17:15 +0000 Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.122] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OKCAO-0003sf-Dg for v9fs-developer@lists.sourceforge.net; Thu, 03 Jun 2010 15:17:08 +0000 Received-SPF: pass (sfi-mx-2.v28.ch3.sourceforge.com: domain of in.ibm.com designates 202.81.31.141 as permitted sender) client-ip=202.81.31.141; envelope-from=sripathik@in.ibm.com; helo=e23smtp08.au.ibm.com; Received: from e23smtp08.au.ibm.com ([202.81.31.141]) by sfi-mx-2.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1OKCAL-0002M8-QU for v9fs-developer@lists.sourceforge.net; Thu, 03 Jun 2010 15:17:08 +0000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp08.au.ibm.com (8.14.4/8.13.1) with ESMTP id o53FGusT015556 for ; Fri, 4 Jun 2010 01:16:56 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o53FGvnE1560736 for ; Fri, 4 Jun 2010 01:16:57 +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 o53FGvZO010558 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-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1OKCAL-0002M8-QU Cc: v9fs-developer@lists.sourceforge.net Subject: [V9fs-developer] [PATCH 1/2] Make v9fs_do_utimensat accept timespec structures instead of v9stat. X-BeenThere: v9fs-developer@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: v9fs-developer-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 03 Jun 2010 15:17:56 +0000 (UTC) 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; } }