diff options
| author | Greg Kurz <gkurz@linux.vnet.ibm.com> | 2016-06-06 11:52:34 +0200 |
|---|---|---|
| committer | Greg Kurz <gkurz@linux.vnet.ibm.com> | 2016-06-06 11:52:34 +0200 |
| commit | 635324e83e238598e86628dba5ab62ce910e6f72 (patch) | |
| tree | 959af05a3fb65f914171fa2c343f8b3fef9130b6 /hw/9pfs/9p-proxy.c | |
| parent | 7cde47d4a89d5efefcc805788bc29133f4f3c5c7 (diff) | |
9p: switch back to readdir()
This patch changes the 9p code to use readdir() again instead of
readdir_r(), which is deprecated in glibc 2.24.
All the locking was put in place by a previous patch.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Diffstat (limited to 'hw/9pfs/9p-proxy.c')
| -rw-r--r-- | hw/9pfs/9p-proxy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 63b0747815..f265501eac 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -678,11 +678,9 @@ static off_t proxy_telldir(FsContext *ctx, V9fsFidOpenState *fs) return telldir(fs->dir.stream); } -static int proxy_readdir_r(FsContext *ctx, V9fsFidOpenState *fs, - struct dirent *entry, - struct dirent **result) +static struct dirent *proxy_readdir(FsContext *ctx, V9fsFidOpenState *fs) { - return readdir_r(fs->dir.stream, entry, result); + return readdir(fs->dir.stream); } static void proxy_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off) @@ -1192,7 +1190,7 @@ FileOperations proxy_ops = { .opendir = proxy_opendir, .rewinddir = proxy_rewinddir, .telldir = proxy_telldir, - .readdir_r = proxy_readdir_r, + .readdir = proxy_readdir, .seekdir = proxy_seekdir, .preadv = proxy_preadv, .pwritev = proxy_pwritev, |