From patchwork Tue Mar 1 06:38:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 84903 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 E2632B7154 for ; Tue, 1 Mar 2011 17:45:14 +1100 (EST) Received: from localhost ([127.0.0.1]:44608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuJKY-0000Yg-1b for incoming@patchwork.ozlabs.org; Tue, 01 Mar 2011 01:45:10 -0500 Received: from [140.186.70.92] (port=39225 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuJEw-0007cf-U4 for qemu-devel@nongnu.org; Tue, 01 Mar 2011 01:39:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PuJEu-00035y-OY for qemu-devel@nongnu.org; Tue, 01 Mar 2011 01:39:22 -0500 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:55862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PuJEu-00035T-8E for qemu-devel@nongnu.org; Tue, 01 Mar 2011 01:39:20 -0500 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp08.au.ibm.com (8.14.4/8.13.1) with ESMTP id p216Y7JO013935 for ; Tue, 1 Mar 2011 17:34:07 +1100 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p216dELN1822750 for ; Tue, 1 Mar 2011 17:39:14 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p216dDZi025808 for ; Tue, 1 Mar 2011 17:39:13 +1100 Received: from skywalker.ibm.com ([9.126.239.109]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p216cxQh025425; Tue, 1 Mar 2011 17:39:12 +1100 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Tue, 1 Mar 2011 12:08:54 +0530 Message-Id: <1298961534-8099-6-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298961534-8099-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1298961534-8099-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.81.31.141 Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH -V2 6/6] hw/9pfs: Add directory reclaim support 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 Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index a4c5905..08c0399 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -138,7 +138,12 @@ static int v9fs_do_open(V9fsState *s, V9fsString *path, int flags) static DIR *v9fs_do_opendir(V9fsState *s, V9fsString *path) { - return s->ops->opendir(&s->ctx, path->data); + DIR *dir; + dir = s->ops->opendir(&s->ctx, path->data); + if (dirfd(dir) > P9_FD_RECLAIM_THRES) { + v9fs_reclaim_fd(s); + } + return dir; } static void v9fs_do_rewinddir(V9fsState *s, DIR *dir) @@ -476,6 +481,10 @@ static V9fsFidState *lookup_fid(V9fsState *s, int32_t fid) f->fsmap.fs.fd = v9fs_do_open(s, &f->fsmap.path, f->fsmap.open_flags); } + } else if (f->fsmap.fid_type == P9_FID_DIR) { + if (f->fsmap.fs.dir == NULL) { + f->fsmap.fs.dir = v9fs_do_opendir(s, &f->fsmap.path); + } } /* * Mark the fid as referenced so that the LRU @@ -542,6 +551,12 @@ static void v9fs_reclaim_fd(V9fsState *s) f->fsmap.fs.fd = -1; reclaim_count++; } + } else if (f->fsmap.fid_type == P9_FID_DIR) { + if (f->fsmap.fs.dir != NULL) { + v9fs_do_closedir(s, f->fsmap.fs.dir); + f->fsmap.fs.dir = NULL; + reclaim_count++; + } } if (reclaim_count >= P9_FD_RECLAIM_THRES/2) { break; @@ -625,7 +640,9 @@ static int free_fid(V9fsState *s, int32_t fid) v9fs_do_close(s, fidp->fsmap.fs.fd); } } else if (fidp->fsmap.fid_type == P9_FID_DIR) { - v9fs_do_closedir(s, fidp->fsmap.fs.dir); + if (fidp->fsmap.fs.dir != NULL) { + v9fs_do_closedir(s, fidp->fsmap.fs.dir); + } } else if (fidp->fsmap.fid_type == P9_FID_XATTR) { retval = v9fs_xattr_fid_clunk(s, fidp); }