From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrSst-00024d-L7 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:19 -0400 Received: from [199.232.76.173] (port=57576 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrSss-00023Z-UF for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:19 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrSsr-0001Xn-6X for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:18 -0400 Received: from mx20.gnu.org ([199.232.41.8]:47235) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NrSsq-0001Sz-KH for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:16 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NrSso-0001YY-K2 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 05:16:15 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp04.au.ibm.com (8.14.3/8.13.1) with ESMTP id o2G9CSN1006850 for ; Tue, 16 Mar 2010 20:12:28 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o2G9GCaF1843306 for ; Tue, 16 Mar 2010 20:16:12 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o2G9GBMf007173 for ; Tue, 16 Mar 2010 20:16:12 +1100 From: "Aneesh Kumar K.V" Date: Tue, 16 Mar 2010 14:45:20 +0530 Message-Id: <1268730920-14584-23-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1268730920-14584-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1268730920-14584-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -v2 22/22] virtio-9p: Update existing fid path on rename List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ericvh@gmail.com, aliguori@us.ibm.com, "Aneesh Kumar K.V" We need to make sure that we update the path component of the existing fid's when we rename a file. The client is not expected to clunk these fids pointing to the old name. If we don't update any operation on the old unopened fid will point to the old name and will fail Add BUG_ON to make sure when we clone a fid, we don't have open descriptor attached to the fid. We also need to make sure that when we open a fid, the specified fid should not already be opened. Capture the case by adding a BUG_ON Signed-off-by: Aneesh Kumar K.V --- hw/virtio-9p.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index c8ab6b6..9aa4b72 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -955,6 +955,9 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) /* FIXME: is this really valid? */ if (fid == newfid) { + + BUG_ON(vs->fidp->fd != -1); + BUG_ON(vs->fidp->dir); v9fs_string_init(&vs->path); vs->name_idx = 0; @@ -1120,6 +1123,9 @@ static void v9fs_open(V9fsState *s, V9fsPDU *pdu) goto out; } + BUG_ON(vs->fidp->fd != -1); + BUG_ON(vs->fidp->dir); + err = posix_lstat(s, &vs->fidp->path, &vs->stbuf); v9fs_open_post_lstat(s, vs, err); @@ -1877,8 +1883,19 @@ out: qemu_free(vs); } +static void v9fs_fix_path(V9fsString *dst, V9fsString *src, int len) +{ + V9fsString str; + v9fs_string_init(&str); + v9fs_string_copy(&str, dst); + v9fs_string_sprintf(dst, "%s%s", src->data, str.data+len); + v9fs_string_free(&str); +} + + static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err) { + V9fsFidState *fidp; if (err < 0) { goto out; } @@ -1905,6 +1922,28 @@ static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err) if (strcmp(new_name, vs->fidp->path.data) != 0) { if (posix_rename(s, &vs->fidp->path, &vs->nname)) { err = -errno; + } else { + /* + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ + for (fidp = s->fid_list; fidp; fidp = fidp->next) { + + if (vs->fidp == fidp) { + /* + * we replace name of this fid towards the end + * so that our below strcmp will work + */ + continue; + } + if (!strncmp(vs->fidp->path.data, fidp->path.data, + strlen(vs->fidp->path.data))) { + /* replace the name */ + v9fs_fix_path(&fidp->path, &vs->nname, + strlen(vs->fidp->path.data)); + } + } + v9fs_string_copy(&vs->fidp->path, &vs->nname); } } } -- 1.7.0.2.273.gc2413