Commit 63236c15 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'aneesh/for-upstream-3' into staging

parents c82dc29a b9cb88b0

hw/9pfs/codir.c

+10 −3
Original line number Diff line number Diff line
@@ -97,15 +97,19 @@ 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;

}



int v9fs_co_closedir(V9fsState *s, V9fsFidState *fidp)

int v9fs_co_closedir(V9fsState *s, DIR *dir)

{

    int err;

    DIR *dir;



    dir = fidp->fs.dir;

    v9fs_co_run_in_worker(

        {

            err = s->ops->closedir(&s->ctx, dir);
@@ -113,5 +117,8 @@ int v9fs_co_closedir(V9fsState *s, V9fsFidState *fidp) 
                err = -errno;

            }

        });

    if (!err) {

        total_open_fd--;

    }

    return err;

}

hw/9pfs/cofile.c

+16 −3
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ int v9fs_co_open(V9fsState *s, V9fsFidState *fidp, int flags) 
                err = 0;

            }

        });

    if (!err) {

        total_open_fd++;

        if (total_open_fd > open_fd_hw) {

            v9fs_reclaim_fd(s);

        }

    }

    return err;

}
@@ -79,15 +85,19 @@ int v9fs_co_open2(V9fsState *s, V9fsFidState *fidp, char *fullname, gid_t gid, 
                err = -errno;

            }

        });

    if (!err) {

        total_open_fd++;

        if (total_open_fd > open_fd_hw) {

            v9fs_reclaim_fd(s);

        }

    }

    return err;

}



int v9fs_co_close(V9fsState *s, V9fsFidState *fidp)

int v9fs_co_close(V9fsState *s, int fd)

{

    int fd;

    int err;



    fd = fidp->fs.fd;

    v9fs_co_run_in_worker(

        {

            err = s->ops->close(&s->ctx, fd);
@@ -95,6 +105,9 @@ int v9fs_co_close(V9fsState *s, V9fsFidState *fidp) 
                err = -errno;

            }

        });

    if (!err) {

        total_open_fd--;

    }

    return err;

}

hw/9pfs/virtio-9p-coth.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ extern int v9fs_co_open2(V9fsState *, V9fsFidState *, char *, gid_t, int, int); 
extern int v9fs_co_lsetxattr(V9fsState *, V9fsString *, V9fsString *,

                             void *, size_t, int);

extern int v9fs_co_lremovexattr(V9fsState *, V9fsString *, V9fsString *);

extern int v9fs_co_closedir(V9fsState *, V9fsFidState *);

extern int v9fs_co_close(V9fsState *, V9fsFidState *);

extern int v9fs_co_closedir(V9fsState *, DIR *);

extern int v9fs_co_close(V9fsState *, int);

extern int v9fs_co_fsync(V9fsState *, V9fsFidState *, int);

extern int v9fs_co_symlink(V9fsState *, V9fsFidState *, const char *,

                           const char *, gid_t);

hw/9pfs/virtio-9p-device.c

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) 
    s->config_size = sizeof(struct virtio_9p_config) +

                        s->tag_len;

    s->vdev.get_config = virtio_9p_get_config;

    s->fid_list = NULL;



    if (v9fs_init_worker_threads() < 0) {

        fprintf(stderr, "worker thread initialization failed\n");
@@ -171,6 +172,7 @@ static PCIDeviceInfo virtio_9p_info = { 
static void virtio_9p_register_devices(void)

{

    pci_qdev_register(&virtio_9p_info);

    virtio_9p_set_fd_limit();

}



device_init(virtio_9p_register_devices)

hw/9pfs/virtio-9p.c

+394 −92

File changed.

Preview size limit exceeded, changes collapsed.