mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
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: 0fd1695766
("fs: Add VirtualBox guest shared folder (vboxsf) support")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
cc3ddee97c
commit
ab0c29687b
@ -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, ¶ms.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)
|
||||
|
Loading…
Reference in New Issue
Block a user