From: Sasha Levin Date: Thu, 30 Aug 2012 07:36:42 +0000 (+0200) Subject: kvm tools: 9p don't nuke fids on attach X-Git-Tag: next-20120904~31^2^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bb2c344431c0a47da8e2f671c5442951f10070b9;p=karo-tx-linux.git kvm tools: 9p don't nuke fids on attach We're not supposed to kill all fids when a new attach request arrives. This used to cause issues when the guest would send multiple attach requests. Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/virtio/9p.c b/tools/kvm/virtio/9p.c index 27ef57b8d06d..d6681060659c 100644 --- a/tools/kvm/virtio/9p.c +++ b/tools/kvm/virtio/9p.c @@ -117,26 +117,6 @@ static void close_fid(struct p9_dev *p9dev, u32 fid) free(pfid); } -static void clear_all_fids(struct p9_dev *p9dev) -{ - struct rb_node *node = rb_first(&p9dev->fids); - - while (node) { - struct p9_fid *fid = rb_entry(node, struct p9_fid, node); - - if (fid->fd > 0) - close(fid->fd); - - if (fid->dir) - closedir(fid->dir); - - rb_erase(&fid->node, &p9dev->fids); - free(fid); - - node = rb_first(&p9dev->fids); - } -} - static void virtio_p9_set_reply_header(struct p9_pdu *pdu, u32 size) { u8 cmd; @@ -443,8 +423,6 @@ static void virtio_p9_attach(struct p9_dev *p9dev, free(uname); free(aname); - clear_all_fids(p9dev); - if (lstat(p9dev->root_dir, &st) < 0) goto err_out;