[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] hw/9pfs: Add directory reclaim support
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH 6/6] hw/9pfs: Add directory reclaim support |
Date: |
Mon, 6 Jun 2011 22:46:58 +0530 |
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/9pfs/codir.c | 9 +++++++++
hw/9pfs/virtio-9p.c | 26 ++++++++++++++++++++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c
index 3347038..2c26f72 100644
--- a/hw/9pfs/codir.c
+++ b/hw/9pfs/codir.c
@@ -98,6 +98,12 @@ int v9fs_co_opendir(V9fsState *s, V9fsFidState *fidp)
err = 0;
}
});
+ if (!err) {
+ total_open_fd++;
+ if (total_open_fd > open_fd_hw) {
+ v9fs_reclaim_fd(s);
+ }
+ }
return err;
}
@@ -112,5 +118,8 @@ int v9fs_co_closedir(V9fsState *s, DIR *dir)
err = -errno;
}
});
+ if (!err) {
+ total_open_fd--;
+ }
return err;
}
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index d322814..55aca93 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -265,7 +265,17 @@ static V9fsFidState *get_fid(V9fsState *s, int32_t fid)
return NULL;
}
}
- }
+ } else if (f->fid_type == P9_FID_DIR) {
+ if (f->fs.dir == NULL) {
+ do {
+ err = v9fs_co_opendir(s, f);
+ } while (err == -EINTR);
+ if (err < 0) {
+ f->ref--;
+ return NULL;
+ }
+ }
+ }
/*
* Mark the fid as referenced so that the LRU
* reclaim won't close the file descriptor
@@ -346,7 +356,9 @@ static int release_fid(V9fsState *s, V9fsFidState *fidp)
retval = v9fs_co_close(s, fidp->fs.fd);
}
} else if (fidp->fid_type == P9_FID_DIR) {
- retval = v9fs_co_closedir(s, fidp->fs.dir);
+ if (fidp->fs.dir != NULL) {
+ retval = v9fs_co_closedir(s, fidp->fs.dir);
+ }
} else if (fidp->fid_type == P9_FID_XATTR) {
retval = v9fs_xattr_fid_clunk(s, fidp);
}
@@ -431,6 +443,14 @@ void v9fs_reclaim_fd(V9fsState *s)
f->fs.fd = -1;
reclaim_count++;
}
+ } else if (f->fid_type == P9_FID_DIR) {
+ if (f->fs.dir != NULL) {
+ f->rclm_lst = reclaim_list;
+ reclaim_list = f;
+ f->fs_reclaim.dir = f->fs.dir;
+ f->fs.dir = NULL;
+ reclaim_count++;
+ }
}
if (reclaim_count >= open_fd_rc) {
break;
@@ -448,6 +468,8 @@ void v9fs_reclaim_fd(V9fsState *s)
} else {
if (f->fid_type == P9_FID_FILE) {
v9fs_co_close(s, f->fs_reclaim.fd);
+ } else if (f->fid_type == P9_FID_DIR) {
+ v9fs_co_closedir(s, f->fs_reclaim.dir);
}
f->rclm_lst = NULL;
}
--
1.7.4.1
- [Qemu-devel] [PATCH 1/6] hw/9pfs: Add reference counting for fid, Aneesh Kumar K.V, 2011/06/06
- [Qemu-devel] [PATCH 5/6] hw/9pfs: Use v9fs_do_close instead of close, Aneesh Kumar K.V, 2011/06/06
- [Qemu-devel] [PATCH 4/6] hw/9pfs: init fid list properly, Aneesh Kumar K.V, 2011/06/06
- [Qemu-devel] [PATCH 2/6] hw/9pfs: Don't free fid in clunk, Aneesh Kumar K.V, 2011/06/06
- [Qemu-devel] [PATCH 6/6] hw/9pfs: Add directory reclaim support,
Aneesh Kumar K.V <=
- [Qemu-devel] [PATCH 3/6] hw/9pfs: Add file descriptor reclaim support, Aneesh Kumar K.V, 2011/06/06
- Re: [Qemu-devel] [PATCH 1/6] hw/9pfs: Add reference counting for fid, Venkateswararao Jujjuri, 2011/06/09