On Tuesday, March 11, 2025 6:28:04 PM CET Greg Kurz wrote: > Factor out duplicated code to a single helper. More users to come. > > Signed-off-by: Greg Kurz <[email protected]> > > v2: - simplified local_fid_fd() > ---
Reviewed-by: Christian Schoenebeck <[email protected]> > hw/9pfs/9p-local.c | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > index 928523afcc6c..99b9560a528b 100644 > --- a/hw/9pfs/9p-local.c > +++ b/hw/9pfs/9p-local.c > @@ -766,16 +766,19 @@ out: > return err; > } > > -static int local_fstat(FsContext *fs_ctx, int fid_type, > - V9fsFidOpenState *fs, struct stat *stbuf) > +static int local_fid_fd(int fid_type, V9fsFidOpenState *fs) > { > - int err, fd; > - > if (fid_type == P9_FID_DIR) { > - fd = dirfd(fs->dir.stream); > + return dirfd(fs->dir.stream); > } else { > - fd = fs->fd; > + return fs->fd; > } > +} > + > +static int local_fstat(FsContext *fs_ctx, int fid_type, > + V9fsFidOpenState *fs, struct stat *stbuf) > +{ > + int err, fd = local_fid_fd(fid_type, fs); > > err = fstat(fd, stbuf); > if (err) { > @@ -1167,13 +1170,7 @@ out: > static int local_fsync(FsContext *ctx, int fid_type, > V9fsFidOpenState *fs, int datasync) > { > - int fd; > - > - if (fid_type == P9_FID_DIR) { > - fd = dirfd(fs->dir.stream); > - } else { > - fd = fs->fd; > - } > + int fd = local_fid_fd(fid_type, fs); > > if (datasync) { > return qemu_fdatasync(fd); >
