diff options
Diffstat (limited to 'libbcachefs/fs-ioctl.c')
| -rw-r--r-- | libbcachefs/fs-ioctl.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/libbcachefs/fs-ioctl.c b/libbcachefs/fs-ioctl.c index d7c1b05a..5a39bcb5 100644 --- a/libbcachefs/fs-ioctl.c +++ b/libbcachefs/fs-ioctl.c @@ -453,35 +453,33 @@ static long bch2_ioctl_subvolume_create(struct bch_fs *c, struct file *filp, static long bch2_ioctl_subvolume_destroy(struct bch_fs *c, struct file *filp, struct bch_ioctl_subvolume arg) { - struct filename *name; struct path path; struct inode *dir; - struct dentry *victim; int ret = 0; if (arg.flags) return -EINVAL; - name = getname((const char __user *)(unsigned long)arg.dst_ptr); - victim = filename_path_locked(arg.dirfd, name, &path); - putname(name); - if (IS_ERR(victim)) - return PTR_ERR(victim); + ret = user_path_at(arg.dirfd, + (const char __user *)(unsigned long)arg.dst_ptr, + LOOKUP_FOLLOW, &path); + if (ret) + return ret; - if (victim->d_sb->s_fs_info != c) { + if (path.dentry->d_sb->s_fs_info != c) { ret = -EXDEV; goto err; } - dir = d_inode(path.dentry); - ret = __bch2_unlink(dir, victim, true); - if (!ret) { - fsnotify_rmdir(dir, victim); - d_delete(victim); - } - inode_unlock(dir); + dir = path.dentry->d_parent->d_inode; + + ret = __bch2_unlink(dir, path.dentry, true); + if (ret) + goto err; + + fsnotify_rmdir(dir, path.dentry); + d_delete(path.dentry); err: - dput(victim); path_put(&path); return ret; } |