summaryrefslogtreecommitdiff
path: root/fs/vboxsf/dir.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2021-01-21 12:22:27 +0300
committerHans de Goede <hdegoede@redhat.com>2021-06-23 15:36:41 +0300
commitab0c29687bc7a890d1a86ac376b0b0fd78b2d9b6 (patch)
treea1be35800a4bfa5991533dbfc1d31efb275e5740 /fs/vboxsf/dir.c
parentcc3ddee97cff034cea4d095de4a484c92a219bf5 (diff)
downloadlinux-ab0c29687bc7a890d1a86ac376b0b0fd78b2d9b6.tar.xz
vboxsf: Make vboxsf_dir_create() return the handle for the created file
Make vboxsf_dir_create() optionally return the vboxsf-handle for the created file. This is a preparation patch for adding atomic_open support. Fixes: 0fd169576648 ("fs: Add VirtualBox guest shared folder (vboxsf) support") Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'fs/vboxsf/dir.c')
-rw-r--r--fs/vboxsf/dir.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/fs/vboxsf/dir.c b/fs/vboxsf/dir.c
index 6ff84343edca..87d5b2fef592 100644
--- a/fs/vboxsf/dir.c
+++ b/fs/vboxsf/dir.c
@@ -253,7 +253,7 @@ static int vboxsf_dir_instantiate(struct inode *parent, struct dentry *dentry,
}
static int vboxsf_dir_create(struct inode *parent, struct dentry *dentry,
- umode_t mode, bool is_dir, bool excl)
+ umode_t mode, bool is_dir, bool excl, u64 *handle_ret)
{
struct vboxsf_inode *sf_parent_i = VBOXSF_I(parent);
struct vboxsf_sbi *sbi = VBOXSF_SBI(parent->i_sb);
@@ -278,30 +278,34 @@ static int vboxsf_dir_create(struct inode *parent, struct dentry *dentry,
if (params.result != SHFL_FILE_CREATED)
return -EPERM;
- vboxsf_close(sbi->root, params.handle);
-
err = vboxsf_dir_instantiate(parent, dentry, &params.info);
if (err)
- return err;
+ goto out;
/* parent directory access/change time changed */
sf_parent_i->force_restat = 1;
- return 0;
+out:
+ if (err == 0 && handle_ret)
+ *handle_ret = params.handle;
+ else
+ vboxsf_close(sbi->root, params.handle);
+
+ return err;
}
static int vboxsf_dir_mkfile(struct user_namespace *mnt_userns,
struct inode *parent, struct dentry *dentry,
umode_t mode, bool excl)
{
- return vboxsf_dir_create(parent, dentry, mode, false, excl);
+ return vboxsf_dir_create(parent, dentry, mode, false, excl, NULL);
}
static int vboxsf_dir_mkdir(struct user_namespace *mnt_userns,
struct inode *parent, struct dentry *dentry,
umode_t mode)
{
- return vboxsf_dir_create(parent, dentry, mode, true, true);
+ return vboxsf_dir_create(parent, dentry, mode, true, true, NULL);
}
static int vboxsf_dir_unlink(struct inode *parent, struct dentry *dentry)