Skip to content

Commit

Permalink
fuse: factor out helper for FUSE_DEV_IOC_CLONE
Browse files Browse the repository at this point in the history
In preparation to adding more fuse dev ioctls.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Amir Goldstein authored and Miklos Szeredi committed Feb 23, 2024
1 parent 205c1d8 commit aed9183
Showing 1 changed file with 33 additions and 26 deletions.
59 changes: 33 additions & 26 deletions fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2251,43 +2251,50 @@ static int fuse_device_clone(struct fuse_conn *fc, struct file *new)
return 0;
}

static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
static long fuse_dev_ioctl_clone(struct file *file, __u32 __user *argp)
{
int res;
int oldfd;
struct fuse_dev *fud = NULL;
struct fd f;

if (get_user(oldfd, argp))
return -EFAULT;

f = fdget(oldfd);
if (!f.file)
return -EINVAL;

/*
* Check against file->f_op because CUSE
* uses the same ioctl handler.
*/
if (f.file->f_op == file->f_op)
fud = fuse_get_dev(f.file);

res = -EINVAL;
if (fud) {
mutex_lock(&fuse_mutex);
res = fuse_device_clone(fud->fc, file);
mutex_unlock(&fuse_mutex);
}

fdput(f);
return res;
}

static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
void __user *argp = (void __user *)arg;

switch (cmd) {
case FUSE_DEV_IOC_CLONE:
if (get_user(oldfd, (__u32 __user *)arg))
return -EFAULT;
return fuse_dev_ioctl_clone(file, argp);

f = fdget(oldfd);
if (!f.file)
return -EINVAL;

/*
* Check against file->f_op because CUSE
* uses the same ioctl handler.
*/
if (f.file->f_op == file->f_op)
fud = fuse_get_dev(f.file);

res = -EINVAL;
if (fud) {
mutex_lock(&fuse_mutex);
res = fuse_device_clone(fud->fc, file);
mutex_unlock(&fuse_mutex);
}
fdput(f);
break;
default:
res = -ENOTTY;
break;
return -ENOTTY;
}
return res;
}

const struct file_operations fuse_dev_operations = {
Expand Down

0 comments on commit aed9183

Please sign in to comment.