Patchwork [6/6] hw/9pfs: Add directory reclaim support

login
register
mail settings
Submitter Aneesh Kumar K.V
Date June 6, 2011, 5:16 p.m.
Message ID <1307380618-1963-6-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/99014/
State New
Headers show

Comments

Aneesh Kumar K.V - June 6, 2011, 5:16 p.m.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 hw/9pfs/codir.c     |    9 +++++++++
 hw/9pfs/virtio-9p.c |   26 ++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
jvrao - June 10, 2011, 1:36 a.m.
On 06/06/2011 10:16 AM, Aneesh Kumar K.V wrote:
> Signed-off-by: Aneesh Kumar K.V<aneesh.kumar@linux.vnet.ibm.com>
Reviewed-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>

> ---
>   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;
>           }

Patch

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;
         }