Unverified Commit 0f428841 authored by Christian Brauner's avatar Christian Brauner
Browse files

autofs: convert autofs_dev_ioctl_open_mountpoint() to FD_ADD()

parent 3d8aefd4
Loading
Loading
Loading
Loading
+6 −24
Original line number Diff line number Diff line
@@ -231,32 +231,14 @@ static int test_by_type(const struct path *path, void *p)
 */
static int autofs_dev_ioctl_open_mountpoint(const char *name, dev_t devid)
{
	int err, fd;

	fd = get_unused_fd_flags(O_CLOEXEC);
	if (likely(fd >= 0)) {
		struct file *filp;
		struct path path;
	struct path path __free(path_put) = {};
	int err;

	err = find_autofs_mount(name, &path, test_by_dev, &devid);
	if (err)
			goto out;

		filp = dentry_open(&path, O_RDONLY, current_cred());
		path_put(&path);
		if (IS_ERR(filp)) {
			err = PTR_ERR(filp);
			goto out;
		}

		fd_install(fd, filp);
	}

	return fd;

out:
	put_unused_fd(fd);
		return err;

	return FD_ADD(O_CLOEXEC, dentry_open(&path, O_RDONLY, current_cred()));
}

/* Open a file descriptor on an autofs mount point */