* Vivek Goyal (vgo...@redhat.com) wrote:
> Move core file creation bits in a separate function. Soon this is going
> to get more complex as file creation need to set security context also.
> And there will be multiple modes of file creation in next patch.
>
> Signed-off-by: Vivek Goyal
Reviewed-by: Dr. David Alan Gilbert
> ---
> tools/virtiofsd/passthrough_ll.c | 36 ++--
> 1 file changed, 25 insertions(+), 11 deletions(-)
>
> diff --git a/tools/virtiofsd/passthrough_ll.c
> b/tools/virtiofsd/passthrough_ll.c
> index 64b5b4fbb1..54978b7fae 100644
> --- a/tools/virtiofsd/passthrough_ll.c
> +++ b/tools/virtiofsd/passthrough_ll.c
> @@ -1976,6 +1976,30 @@ static int lo_do_open(struct lo_data *lo, struct
> lo_inode *inode,
> return 0;
> }
>
> +static int do_lo_create(fuse_req_t req, struct lo_inode *parent_inode,
> +const char *name, mode_t mode,
> +struct fuse_file_info *fi, int* open_fd)
> +{
> +int err = 0, fd;
> +struct lo_cred old = {};
> +struct lo_data *lo = lo_data(req);
> +
> +err = lo_change_cred(req, , lo->change_umask);
> +if (err) {
> +return err;
> +}
> +
> +/* Try to create a new file but don't open existing files */
> +fd = openat(parent_inode->fd, name, fi->flags | O_CREAT | O_EXCL, mode);
> +if (fd == -1) {
> +err = errno;
> +} else {
> +*open_fd = fd;
> +}
> +lo_restore_cred(, lo->change_umask);
> +return err;
> +}
> +
> static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
>mode_t mode, struct fuse_file_info *fi)
> {
> @@ -1985,7 +2009,6 @@ static void lo_create(fuse_req_t req, fuse_ino_t
> parent, const char *name,
> struct lo_inode *inode = NULL;
> struct fuse_entry_param e;
> int err;
> -struct lo_cred old = {};
>
> fuse_log(FUSE_LOG_DEBUG, "lo_create(parent=%" PRIu64 ", name=%s)"
> " kill_priv=%d\n", parent, name, fi->kill_priv);
> @@ -2001,18 +2024,9 @@ static void lo_create(fuse_req_t req, fuse_ino_t
> parent, const char *name,
> return;
> }
>
> -err = lo_change_cred(req, , lo->change_umask);
> -if (err) {
> -goto out;
> -}
> -
> update_open_flags(lo->writeback, lo->allow_direct_io, fi);
>
> -/* Try to create a new file but don't open existing files */
> -fd = openat(parent_inode->fd, name, fi->flags | O_CREAT | O_EXCL, mode);
> -err = fd == -1 ? errno : 0;
> -
> -lo_restore_cred(, lo->change_umask);
> +err = do_lo_create(req, parent_inode, name, mode, fi, );
>
> /* Ignore the error if file exists and O_EXCL was not given */
> if (err && (err != EEXIST || (fi->flags & O_EXCL))) {
> --
> 2.31.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
