summaryrefslogtreecommitdiff
path: root/Kernel/VirtualFileSystem.h
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-03-06 22:30:13 +0100
committerAndreas Kling <awesomekling@gmail.com>2019-03-06 22:30:13 +0100
commite56fe71dbc97a56f016f1de8aeedd4fa0105f4d7 (patch)
tree35b2b908c63d830fbabe468102f31dab79faa679 /Kernel/VirtualFileSystem.h
parent028afabf6b22664c728f07234bc1dda0f8cb0fbe (diff)
downloadserenity-e56fe71dbc97a56f016f1de8aeedd4fa0105f4d7.zip
Kernel: And some more KResult/KResultOr<T> porting work.
Diffstat (limited to 'Kernel/VirtualFileSystem.h')
-rw-r--r--Kernel/VirtualFileSystem.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/Kernel/VirtualFileSystem.h b/Kernel/VirtualFileSystem.h
index d72cf9fb3c..6baee90cd0 100644
--- a/Kernel/VirtualFileSystem.h
+++ b/Kernel/VirtualFileSystem.h
@@ -84,8 +84,8 @@ public:
size_t mount_count() const { return m_mounts.size(); }
void for_each_mount(Function<void(const Mount&)>) const;
- String absolute_path(Inode&);
- String absolute_path(InodeIdentifier);
+ KResultOr<String> absolute_path(Inode&);
+ KResultOr<String> absolute_path(InodeIdentifier);
InodeIdentifier root_inode_id() const;
Inode* root_inode() { return m_root_inode.ptr(); }
@@ -105,7 +105,6 @@ private:
void traverse_directory_inode(Inode&, Function<bool(const FS::DirectoryEntry&)>);
InodeIdentifier old_resolve_path(const String& path, InodeIdentifier base, int& error, int options = 0, InodeIdentifier* parent_id = nullptr);
KResultOr<InodeIdentifier> resolve_path(const String& path, InodeIdentifier base, int options = 0, InodeIdentifier* parent_id = nullptr);
- RetainPtr<Inode> resolve_path_to_inode(const String& path, Inode& base, int& error, RetainPtr<Inode>* parent_id = nullptr);
KResultOr<Retained<Inode>> resolve_path_to_inode(const String& path, Inode& base, RetainPtr<Inode>* parent_id = nullptr, int options = 0);
KResultOr<InodeIdentifier> resolve_symbolic_link(InodeIdentifier base, Inode& symlink_inode);