beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel: Closing a file descriptor should not always close the file

Browse source 
When there is more than one file descriptor for a file closing
one of them should not close the underlying file.

Previously this relied on the file's ref_count() but at least
for sockets this didn't work reliably.
This commit is contained in:
Gunnar Beutner 2021-04-30 10:33:33 +02:00 committed by Andreas Kling
parent cae33305b0
commit 7a1d09ef1a
Notes: sideshowbarker 2024-07-18 18:52:44 +09:00 
Author: https://github.com/gunnarbeutner
Commit: https://github.com/SerenityOS/serenity/commit/7a1d09ef1a7
Pull-request: https://github.com/SerenityOS/serenity/pull/6751
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Kernel/FileSystem/File.cpp
View file

@ -43,4 +43,15 @@ KResultOr<Region*> File::mmap(Process&, FileDescription&, const Range&, u64, int
return ENODEV;
}
KResult File::attach(FileDescription&)
{
m_attach_count++;
return KSuccess;
}
void File::detach(FileDescription&)
{
m_attach_count--;
}
}

7
Kernel/FileSystem/File.h
View file

@ -82,8 +82,8 @@ public:
virtual bool can_read(const FileDescription&, size_t) const = 0;
virtual bool can_write(const FileDescription&, size_t) const = 0;
virtual KResult attach(FileDescription&) { return KSuccess; }
virtual void detach(FileDescription&) { }
virtual KResult attach(FileDescription&);
virtual void detach(FileDescription&);
virtual void did_seek(FileDescription&, off_t) { }
virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) = 0;
virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) = 0;
@ -112,6 +112,8 @@ public:
virtual FileBlockCondition& block_condition() { return m_block_condition; }
size_t attach_count() const { return m_attach_count; }
protected:
File();
@ -138,6 +140,7 @@ private:
}
FileBlockCondition m_block_condition;
size_t m_attach_count { 0 };
};
}

2
Kernel/FileSystem/FileDescription.cpp
View file

@ -288,7 +288,7 @@ MasterPTY* FileDescription::master_pty()
KResult FileDescription::close()
{
if (m_file->ref_count() > 1)
if (m_file->attach_count() > 0)
return KSuccess;
return m_file->close();
}