Commit 635324e8 authored by Greg Kurz's avatar Greg Kurz
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarGreg Kurz <gkurz@linux.vnet.ibm.com>
parent 7cde47d4

fsdev/file-op-9p.h

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ struct FileOperations 
                 int, FsCred *, V9fsFidOpenState *);

    void (*rewinddir)(FsContext *, V9fsFidOpenState *);

    off_t (*telldir)(FsContext *, V9fsFidOpenState *);

    int (*readdir_r)(FsContext *, V9fsFidOpenState *,

                     struct dirent *, struct dirent **);

    struct dirent * (*readdir)(FsContext *, V9fsFidOpenState *);

    void (*seekdir)(FsContext *, V9fsFidOpenState *, off_t);

    ssize_t (*preadv)(FsContext *, V9fsFidOpenState *,

                      const struct iovec *, int, off_t);

hw/9pfs/9p-handle.c

+3 −5
Original line number Diff line number Diff line
@@ -149,11 +149,9 @@ static off_t handle_telldir(FsContext *ctx, V9fsFidOpenState *fs) 
    return telldir(fs->dir.stream);

}



static int handle_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,

                            struct dirent *entry,

                            struct dirent **result)

static struct dirent *handle_readdir(FsContext *ctx, V9fsFidOpenState *fs)

{

    return readdir_r(fs->dir.stream, entry, result);

    return readdir(fs->dir.stream);

}



static void handle_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
@@ -681,7 +679,7 @@ FileOperations handle_ops = { 
    .opendir      = handle_opendir,

    .rewinddir    = handle_rewinddir,

    .telldir      = handle_telldir,

    .readdir_r    = handle_readdir_r,

    .readdir      = handle_readdir,

    .seekdir      = handle_seekdir,

    .preadv       = handle_preadv,

    .pwritev      = handle_pwritev,

hw/9pfs/9p-local.c

+11 −9
Original line number Diff line number Diff line
@@ -388,25 +388,27 @@ static off_t local_telldir(FsContext *ctx, V9fsFidOpenState *fs) 
    return telldir(fs->dir.stream);

}



static int local_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,

                           struct dirent *entry,

                           struct dirent **result)

static struct dirent *local_readdir(FsContext *ctx, V9fsFidOpenState *fs)

{

    int ret;

    struct dirent *entry;



again:

    ret = readdir_r(fs->dir.stream, entry, result);

    entry = readdir(fs->dir.stream);

    if (!entry) {

        return NULL;

    }



    if (ctx->export_flags & V9FS_SM_MAPPED) {

        entry->d_type = DT_UNKNOWN;

    } else if (ctx->export_flags & V9FS_SM_MAPPED_FILE) {

        if (!ret && *result != NULL &&

            !strcmp(entry->d_name, VIRTFS_META_DIR)) {

        if (!strcmp(entry->d_name, VIRTFS_META_DIR)) {

            /* skp the meta data directory */

            goto again;

        }

        entry->d_type = DT_UNKNOWN;

    }

    return ret;



    return entry;

}



static void local_seekdir(FsContext *ctx, V9fsFidOpenState *fs, off_t off)
@@ -1254,7 +1256,7 @@ FileOperations local_ops = { 
    .opendir = local_opendir,

    .rewinddir = local_rewinddir,

    .telldir = local_telldir,

    .readdir_r = local_readdir_r,

    .readdir = local_readdir,

    .seekdir = local_seekdir,

    .preadv = local_preadv,

    .pwritev = local_pwritev,

hw/9pfs/9p-proxy.c

+3 −5
Original line number Diff line number Diff line
@@ -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,

hw/9pfs/9p-synth.c

+10 −13
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ static void v9fs_synth_direntry(V9fsSynthNode *node, 
    entry->d_off = off + 1;

}



static int v9fs_synth_get_dentry(V9fsSynthNode *dir, struct dirent *entry,

                                 struct dirent **result, off_t off)

static struct dirent *v9fs_synth_get_dentry(V9fsSynthNode *dir,

                                            struct dirent *entry, off_t off)

{

    int i = 0;

    V9fsSynthNode *node;
@@ -240,25 +240,22 @@ static int v9fs_synth_get_dentry(V9fsSynthNode *dir, struct dirent *entry, 
    rcu_read_unlock();

    if (!node) {

        /* end of directory */

        *result = NULL;

        return 0;

        return NULL;

    }

    v9fs_synth_direntry(node, entry, off);

    *result = entry;

    return 0;

    return entry;

}



static int v9fs_synth_readdir_r(FsContext *ctx, V9fsFidOpenState *fs,

                                struct dirent *entry, struct dirent **result)

static struct dirent *v9fs_synth_readdir(FsContext *ctx, V9fsFidOpenState *fs)

{

    int ret;

    struct dirent *entry;

    V9fsSynthOpenState *synth_open = fs->private;

    V9fsSynthNode *node = synth_open->node;

    ret = v9fs_synth_get_dentry(node, entry, result, synth_open->offset);

    if (!ret && *result != NULL) {

    entry = v9fs_synth_get_dentry(node, &synth_open->dent, synth_open->offset);

    if (entry) {

        synth_open->offset++;

    }

    return ret;

    return entry;

}



static int v9fs_synth_open(FsContext *ctx, V9fsPath *fs_path,
@@ -544,7 +541,7 @@ FileOperations synth_ops = { 
    .opendir      = v9fs_synth_opendir,

    .rewinddir    = v9fs_synth_rewinddir,

    .telldir      = v9fs_synth_telldir,

    .readdir_r    = v9fs_synth_readdir_r,

    .readdir      = v9fs_synth_readdir,

    .seekdir      = v9fs_synth_seekdir,

    .preadv       = v9fs_synth_preadv,

    .pwritev      = v9fs_synth_pwritev,