RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:48:11 +00:00
Code Issues Activity Actions

Kernel: Rename file_description(fd) => open_file_description(fd)

Browse source 
To go with the class rename.
This commit is contained in:
Andreas Kling 2021-09-07 13:41:27 +02:00
parent 4a9c18afb9
commit 213b8868af
24 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Process.cpp
View file

@ -451,7 +451,7 @@ Process::OpenFileDescriptionAndFlags& Process::OpenFileDescriptions::at(size_t i
return m_fds_metadatas[i];
}
KResultOr<NonnullRefPtr<OpenFileDescription>> Process::OpenFileDescriptions::file_description(int fd) const
KResultOr<NonnullRefPtr<OpenFileDescription>> Process::OpenFileDescriptions::open_file_description(int fd) const
{
SpinlockLocker lock(m_fds_lock);
if (fd < 0)

2
Kernel/Process.h
View file

@ -676,7 +676,7 @@ public:
m_fds_metadatas.clear();
}
KResultOr<NonnullRefPtr<OpenFileDescription>> file_description(int fd) const;
KResultOr<NonnullRefPtr<OpenFileDescription>> open_file_description(int fd) const;
private:
OpenFileDescriptions() = default;

2
Kernel/ProcessSpecificExposed.cpp
View file

@ -79,7 +79,7 @@ KResultOr<NonnullRefPtr<Inode>> Process::lookup_stacks_directory(const ProcFS& p
KResultOr<size_t> Process::procfs_get_file_description_link(unsigned fd, KBufferBuilder& builder) const
{
auto file_description = TRY(m_fds.file_description(fd));
auto file_description = TRY(m_fds.open_file_description(fd));
auto data = file_description->absolute_path();
TRY(builder.append(data));
return data.length();

2
Kernel/Syscalls/chdir.cpp
View file

@ -23,7 +23,7 @@ KResultOr<FlatPtr> Process::sys$fchdir(int fd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
REQUIRE_PROMISE(stdio);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_directory())
return ENOTDIR;
if (!description->metadata().may_execute(*this))

2
Kernel/Syscalls/chmod.cpp
View file

@ -22,7 +22,7 @@ KResultOr<FlatPtr> Process::sys$fchmod(int fd, mode_t mode)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
REQUIRE_PROMISE(fattr);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
return description->chmod(mode);
}

2
Kernel/Syscalls/chown.cpp
View file

@ -13,7 +13,7 @@ KResultOr<FlatPtr> Process::sys$fchown(int fd, UserID uid, GroupID gid)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
REQUIRE_PROMISE(chown);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
return description->chown(uid, gid);
}

2
Kernel/Syscalls/dup2.cpp
View file

@ -13,7 +13,7 @@ KResultOr<FlatPtr> Process::sys$dup2(int old_fd, int new_fd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
REQUIRE_PROMISE(stdio);
auto description = TRY(fds().file_description(old_fd));
auto description = TRY(fds().open_file_description(old_fd));
if (old_fd == new_fd)
return new_fd;
if (new_fd < 0 || static_cast<size_t>(new_fd) >= fds().max_open())

2
Kernel/Syscalls/fcntl.cpp
View file

@ -15,7 +15,7 @@ KResultOr<FlatPtr> Process::sys$fcntl(int fd, int cmd, u32 arg)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
REQUIRE_PROMISE(stdio);
dbgln_if(IO_DEBUG, "sys$fcntl: fd={}, cmd={}, arg={}", fd, cmd, arg);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
// NOTE: The FD flags are not shared between OpenFileDescription objects.
// This means that dup() doesn't copy the FD_CLOEXEC flag!
switch (cmd) {

2
Kernel/Syscalls/ftruncate.cpp
View file

@ -17,7 +17,7 @@ KResultOr<FlatPtr> Process::sys$ftruncate(int fd, Userspace<off_t*> userspace_le
TRY(copy_from_user(&length, userspace_length));
if (length < 0)
return EINVAL;
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_writable())
return EBADF;
return description->truncate(static_cast<u64>(length));

2
Kernel/Syscalls/get_dir_entries.cpp
View file

@ -15,7 +15,7 @@ KResultOr<FlatPtr> Process::sys$get_dir_entries(int fd, Userspace<void*> user_bu
REQUIRE_PROMISE(stdio);
if (user_size > NumericLimits<ssize_t>::max())
return EINVAL;
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
auto buffer = UserOrKernelBuffer::for_user_buffer(user_buffer, static_cast<size_t>(user_size));
if (!buffer.has_value())
return EFAULT;

4
Kernel/Syscalls/inode_watcher.cpp
View file

@ -40,7 +40,7 @@ KResultOr<FlatPtr> Process::sys$inode_watcher_add_watch(Userspace<const Syscall:
REQUIRE_PROMISE(rpath);
auto params = TRY(copy_typed_from_user(user_params));
auto description = TRY(fds().file_description(params.fd));
auto description = TRY(fds().open_file_description(params.fd));
if (!description->is_inode_watcher())
return EBADF;
auto inode_watcher = description->inode_watcher();
@ -55,7 +55,7 @@ KResultOr<FlatPtr> Process::sys$inode_watcher_add_watch(Userspace<const Syscall:
KResultOr<FlatPtr> Process::sys$inode_watcher_remove_watch(int fd, int wd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_inode_watcher())
return EBADF;
return description->inode_watcher()->unregister_by_wd(wd);

2
Kernel/Syscalls/ioctl.cpp
View file

@ -13,7 +13,7 @@ namespace Kernel {
KResultOr<FlatPtr> Process::sys$ioctl(int fd, unsigned request, FlatPtr arg)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (request == FIONBIO) {
description->set_blocking(arg == 0);
return KSuccess;

2
Kernel/Syscalls/lseek.cpp
View file

@ -13,7 +13,7 @@ KResultOr<FlatPtr> Process::sys$lseek(int fd, Userspace<off_t*> userspace_offset
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(stdio);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
off_t offset;
TRY(copy_from_user(&offset, userspace_offset));
auto seek_result = TRY(description->seek(offset, whence));

2
Kernel/Syscalls/mmap.cpp
View file

@ -221,7 +221,7 @@ KResultOr<FlatPtr> Process::sys$mmap(Userspace<const Syscall::SC_mmap_params*> u
return EINVAL;
if (static_cast<size_t>(offset) & ~PAGE_MASK)
return EINVAL;
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (description->is_directory())
return ENODEV;
// Require read access even when read protection is not requested.

2
Kernel/Syscalls/mount.cpp
View file

@ -32,7 +32,7 @@ KResultOr<FlatPtr> Process::sys$mount(Userspace<const Syscall::SC_mount_params*>
auto fs_type_string = TRY(try_copy_kstring_from_user(params.fs_type));
auto fs_type = fs_type_string->view();
auto description_or_error = fds().file_description(source_fd);
auto description_or_error = fds().open_file_description(source_fd);
if (!description_or_error.is_error())
dbgln("mount {}: source fd {} @ {}", fs_type, source_fd, target);
else

4
Kernel/Syscalls/open.cpp
View file

@ -46,7 +46,7 @@ KResultOr<FlatPtr> Process::sys$open(Userspace<const Syscall::SC_open_params*> u
if (dirfd == AT_FDCWD) {
base = current_directory();
} else {
auto base_description = TRY(fds().file_description(dirfd));
auto base_description = TRY(fds().open_file_description(dirfd));
if (!base_description->is_directory())
return ENOTDIR;
if (!base_description->custody())
@ -68,7 +68,7 @@ KResultOr<FlatPtr> Process::sys$close(int fd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(stdio);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
auto result = description->close();
m_fds[fd] = {};
return result;

4
Kernel/Syscalls/read.cpp
View file

@ -34,7 +34,7 @@ KResultOr<FlatPtr> Process::sys$readv(int fd, Userspace<const struct iovec*> iov
return EINVAL;
}
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_readable())
return EBADF;
if (description->is_directory())
@ -71,7 +71,7 @@ KResultOr<FlatPtr> Process::sys$read(int fd, Userspace<u8*> buffer, size_t size)
if (size > NumericLimits<ssize_t>::max())
return EINVAL;
dbgln_if(IO_DEBUG, "sys$read({}, {}, {})", fd, buffer.ptr(), size);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_readable())
return EBADF;
if (description->is_directory())

4
Kernel/Syscalls/select.cpp
View file

@ -71,7 +71,7 @@ KResultOr<FlatPtr> Process::sys$select(Userspace<const Syscall::SC_select_params
if (block_flags == BlockFlags::None)
continue;
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!fds_info.try_append({ move(description), block_flags }))
return ENOMEM;
if (!selected_fds.try_append(fd))
@ -154,7 +154,7 @@ KResultOr<FlatPtr> Process::sys$poll(Userspace<const Syscall::SC_poll_params*> u
Thread::SelectBlocker::FDVector fds_info;
for (size_t i = 0; i < params.nfds; i++) {
auto& pfd = fds_copy[i];
auto description = TRY(fds().file_description(pfd.fd));
auto description = TRY(fds().open_file_description(pfd.fd));
BlockFlags block_flags = BlockFlags::Exception; // always want POLLERR, POLLHUP, POLLNVAL
if (pfd.events & POLLIN)
block_flags |= BlockFlags::Read;

6
Kernel/Syscalls/sendfd.cpp
View file

@ -14,7 +14,7 @@ KResultOr<FlatPtr> Process::sys$sendfd(int sockfd, int fd)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(sendfd);
auto socket_description = TRY(fds().file_description(sockfd));
auto socket_description = TRY(fds().open_file_description(sockfd));
if (!socket_description->is_socket())
return ENOTSOCK;
auto& socket = *socket_description->socket();
@ -23,7 +23,7 @@ KResultOr<FlatPtr> Process::sys$sendfd(int sockfd, int fd)
if (!socket.is_connected())
return ENOTCONN;
auto passing_descriptor = TRY(fds().file_description(fd));
auto passing_descriptor = TRY(fds().open_file_description(fd));
auto& local_socket = static_cast<LocalSocket&>(socket);
return local_socket.sendfd(*socket_description, *passing_descriptor);
}
@ -32,7 +32,7 @@ KResultOr<FlatPtr> Process::sys$recvfd(int sockfd, int options)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(recvfd);
auto socket_description = TRY(fds().file_description(sockfd));
auto socket_description = TRY(fds().open_file_description(sockfd));
if (!socket_description->is_socket())
return ENOTSOCK;
auto& socket = *socket_description->socket();

20
Kernel/Syscalls/socket.cpp
View file

@ -48,7 +48,7 @@ KResultOr<FlatPtr> Process::sys$socket(int domain, int type, int protocol)
KResultOr<FlatPtr> Process::sys$bind(int sockfd, Userspace<const sockaddr*> address, socklen_t address_length)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -61,7 +61,7 @@ KResultOr<FlatPtr> Process::sys$listen(int sockfd, int backlog)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
if (backlog < 0)
return EINVAL;
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -88,7 +88,7 @@ KResultOr<FlatPtr> Process::sys$accept4(Userspace<const Syscall::SC_accept4_para
}
auto fd_allocation = TRY(m_fds.allocate());
auto accepting_socket_description = TRY(fds().file_description(accepting_socket_fd));
auto accepting_socket_description = TRY(fds().open_file_description(accepting_socket_fd));
if (!accepting_socket_description->is_socket())
return ENOTSOCK;
auto& socket = *accepting_socket_description->socket();
@ -132,7 +132,7 @@ KResultOr<FlatPtr> Process::sys$accept4(Userspace<const Syscall::SC_accept4_para
KResultOr<FlatPtr> Process::sys$connect(int sockfd, Userspace<const sockaddr*> user_address, socklen_t user_address_size)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -146,7 +146,7 @@ KResultOr<FlatPtr> Process::sys$shutdown(int sockfd, int how)
REQUIRE_PROMISE(stdio);
if (how & ~SHUT_RDWR)
return EINVAL;
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -173,7 +173,7 @@ KResultOr<FlatPtr> Process::sys$sendmsg(int sockfd, Userspace<const struct msghd
Userspace<const sockaddr*> user_addr((FlatPtr)msg.msg_name);
socklen_t addr_length = msg.msg_namelen;
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -207,7 +207,7 @@ KResultOr<FlatPtr> Process::sys$recvmsg(int sockfd, Userspace<struct msghdr*> us
Userspace<sockaddr*> user_addr((FlatPtr)msg.msg_name);
Userspace<socklen_t*> user_addr_length(msg.msg_name ? (FlatPtr)&user_msg.unsafe_userspace_ptr()->msg_namelen : 0);
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -265,7 +265,7 @@ KResult Process::get_sock_or_peer_name(const Params& params)
if (addrlen_value <= 0)
return EINVAL;
auto description = TRY(fds().file_description(params.sockfd));
auto description = TRY(fds().open_file_description(params.sockfd));
if (!description->is_socket())
return ENOTSOCK;
@ -310,7 +310,7 @@ KResultOr<FlatPtr> Process::sys$getsockopt(Userspace<const Syscall::SC_getsockop
socklen_t value_size;
TRY(copy_from_user(&value_size, params.value_size, sizeof(socklen_t)));
auto description = TRY(fds().file_description(sockfd));
auto description = TRY(fds().open_file_description(sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();
@ -324,7 +324,7 @@ KResultOr<FlatPtr> Process::sys$setsockopt(Userspace<const Syscall::SC_setsockop
auto params = TRY(copy_typed_from_user(user_params));
Userspace<const void*> user_value((FlatPtr)params.value);
auto description = TRY(fds().file_description(params.sockfd));
auto description = TRY(fds().open_file_description(params.sockfd));
if (!description->is_socket())
return ENOTSOCK;
auto& socket = *description->socket();

4
Kernel/Syscalls/stat.cpp
View file

@ -15,7 +15,7 @@ KResultOr<FlatPtr> Process::sys$fstat(int fd, Userspace<stat*> user_statbuf)
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(stdio);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
stat buffer = {};
TRY(description->stat(buffer));
return copy_to_user(user_statbuf, &buffer);
@ -33,7 +33,7 @@ KResultOr<FlatPtr> Process::sys$stat(Userspace<const Syscall::SC_stat_params*> u
if (params.dirfd == AT_FDCWD) {
base = current_directory();
} else {
auto base_description = TRY(fds().file_description(params.dirfd));
auto base_description = TRY(fds().open_file_description(params.dirfd));
if (!base_description->is_directory())
return ENOTDIR;
if (!base_description->custody())

2
Kernel/Syscalls/statvfs.cpp
View file

@ -76,7 +76,7 @@ KResultOr<FlatPtr> Process::sys$fstatvfs(int fd, statvfs* buf)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(stdio);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
return do_statvfs(description->absolute_path(), buf);
}

4
Kernel/Syscalls/ttyname.cpp
View file

@ -15,7 +15,7 @@ KResultOr<FlatPtr> Process::sys$ttyname(int fd, Userspace<char*> buffer, size_t
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(tty);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_tty())
return ENOTTY;
auto tty_name = description->tty()->tty_name();
@ -28,7 +28,7 @@ KResultOr<FlatPtr> Process::sys$ptsname(int fd, Userspace<char*> buffer, size_t
{
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this)
REQUIRE_PROMISE(tty);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
auto* master_pty = description->master_pty();
if (!master_pty)
return ENOTTY;

4
Kernel/Syscalls/write.cpp
View file

@ -33,7 +33,7 @@ KResultOr<FlatPtr> Process::sys$writev(int fd, Userspace<const struct iovec*> io
return EINVAL;
}
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_writable())
return EBADF;
@ -101,7 +101,7 @@ KResultOr<FlatPtr> Process::sys$write(int fd, Userspace<const u8*> data, size_t
return EINVAL;
dbgln_if(IO_DEBUG, "sys$write({}, {}, {})", fd, data.ptr(), size);
auto description = TRY(fds().file_description(fd));
auto description = TRY(fds().open_file_description(fd));
if (!description->is_writable())
return EBADF;