Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-18 12:38:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ramfs: Use the generic open_mode_to_access.

Browse Source 
And clean up O_TRUNC at the same time.
This commit is contained in:
Augustin Cavalier 2025-01-14 18:29:57 -05:00
parent 7e29de9266
commit eab4f99826
2 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/add-ons/kernel/file_systems/ramfs/Node.h
View File

@ -25,13 +25,6 @@ enum {
NODE_TYPE_SPECIAL, NODE_TYPE_SPECIAL,
}; };
// access modes
enum {
ACCESS_R = S_IROTH,
ACCESS_W = S_IWOTH,
ACCESS_X = S_IXOTH,
};
class Node : public DoublyLinkedListLinkImpl<Node> { class Node : public DoublyLinkedListLinkImpl<Node> {
public: public:
Node(Volume *volume, uint8 type); Node(Volume *volume, uint8 type);
@ -150,23 +143,6 @@ Node::MarkUnmodified()
return modified; return modified;
} }
// open_mode_to_access
inline static
int
open_mode_to_access(int openMode)
{
switch (openMode & O_RWMASK) {
case O_RDONLY:
return ACCESS_R;
case O_WRONLY:
return ACCESS_W;
case O_RDWR:
return ACCESS_R | ACCESS_W;
}
return 0;
}
// NodeMTimeUpdater // NodeMTimeUpdater
class NodeMTimeUpdater { class NodeMTimeUpdater {
public: public:

40
src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp
View File

@ -36,6 +36,7 @@
#include <fs_interface.h> #include <fs_interface.h>
#include <fs_query.h> #include <fs_query.h>
#include <fs_volume.h> #include <fs_volume.h>
#include <fs_ops_support.h>
#include <vfs.h> #include <vfs.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <NodeMonitor.h> #include <NodeMonitor.h>
@ -420,7 +421,7 @@ ramfs_create_symlink(fs_volume* _volume, fs_vnode* _dir, const char *name,
} }
// check directory write permissions // check directory write permissions
error = dir->CheckPermissions(ACCESS_W); error = dir->CheckPermissions(W_OK);
Node *node = NULL; Node *node = NULL;
if (error == B_OK) { if (error == B_OK) {
// check if entry does already exist // check if entry does already exist
@ -477,7 +478,7 @@ ramfs_link(fs_volume* _volume, fs_vnode* _dir, const char *name,
SET_ERROR(error, B_NOT_ALLOWED); SET_ERROR(error, B_NOT_ALLOWED);
} }
// check directory write permissions // check directory write permissions
error = dir->CheckPermissions(ACCESS_W); error = dir->CheckPermissions(W_OK);
Entry *entry = NULL; Entry *entry = NULL;
if (error == B_OK) { if (error == B_OK) {
// check if entry does already exist // check if entry does already exist
@ -517,7 +518,7 @@ ramfs_unlink(fs_volume* _volume, fs_vnode* _dir, const char *name)
NodeMTimeUpdater mTimeUpdater(dir); NodeMTimeUpdater mTimeUpdater(dir);
// check directory write permissions // check directory write permissions
error = dir->CheckPermissions(ACCESS_W); error = dir->CheckPermissions(W_OK);
ino_t nodeID = -1; ino_t nodeID = -1;
if (error == B_OK) { if (error == B_OK) {
// check if entry exists // check if entry exists
@ -573,9 +574,9 @@ ramfs_rename(fs_volume* _volume, fs_vnode* _oldDir, const char *oldName,
// check directory write permissions // check directory write permissions
if (error == B_OK) if (error == B_OK)
error = oldDir->CheckPermissions(ACCESS_W); error = oldDir->CheckPermissions(W_OK);
if (error == B_OK) if (error == B_OK)
error = newDir->CheckPermissions(ACCESS_W); error = newDir->CheckPermissions(W_OK);
Node *node = NULL; Node *node = NULL;
Entry *entry = NULL; Entry *entry = NULL;
@ -724,7 +725,7 @@ ramfs_write_stat(fs_volume* _volume, fs_vnode* _node, const struct stat *st,
status_t error = B_OK; status_t error = B_OK;
NodeMTimeUpdater mTimeUpdater(node); NodeMTimeUpdater mTimeUpdater(node);
// check permissions // check permissions
error = node->CheckPermissions(ACCESS_W); error = node->CheckPermissions(W_OK);
// size // size
if (error == B_OK && (mask & B_STAT_SIZE)) if (error == B_OK && (mask & B_STAT_SIZE))
error = node->SetSize(st->st_size); error = node->SetSize(st->st_size);
@ -831,7 +832,7 @@ ramfs_create(fs_volume* _volume, fs_vnode* _dir, const char *name, int openMode,
} else if (!node->IsFile()) { } else if (!node->IsFile()) {
SET_ERROR(error, B_NOT_ALLOWED); SET_ERROR(error, B_NOT_ALLOWED);
// the user must have write permission for an existing entry // the user must have write permission for an existing entry
} else if ((error = node->CheckPermissions(ACCESS_W)) == B_OK) { } else if ((error = node->CheckPermissions(W_OK)) == B_OK) {
// truncate, if requested // truncate, if requested
if (openMode & O_TRUNC) if (openMode & O_TRUNC)
error = node->SetSize(0); error = node->SetSize(0);
@ -843,7 +844,7 @@ ramfs_create(fs_volume* _volume, fs_vnode* _dir, const char *name, int openMode,
} }
} }
// the user must have dir write permission to create a new entry // the user must have dir write permission to create a new entry
} else if ((error = dir->CheckPermissions(ACCESS_W)) == B_OK) { } else if ((error = dir->CheckPermissions(W_OK)) == B_OK) {
// entry doesn't exist: create a file // entry doesn't exist: create a file
File *file = NULL; File *file = NULL;
error = dir->CreateFile(name, &file); error = dir->CreateFile(name, &file);
@ -909,7 +910,7 @@ ramfs_create_special_node(fs_volume *_volume, fs_vnode *_dir, const char *name,
if (dir->FindNode(name, &existingNode) == B_OK) if (dir->FindNode(name, &existingNode) == B_OK)
RETURN_ERROR(B_FILE_EXISTS); RETURN_ERROR(B_FILE_EXISTS);
error = dir->CheckPermissions(ACCESS_W); error = dir->CheckPermissions(W_OK);
if (error != B_OK) if (error != B_OK)
RETURN_ERROR(error); RETURN_ERROR(error);
@ -963,9 +964,6 @@ ramfs_open(fs_volume* _volume, fs_vnode* _node, int openMode, void** _cookie)
error = B_NOT_A_DIRECTORY; error = B_NOT_A_DIRECTORY;
int accessMode = open_mode_to_access(openMode); int accessMode = open_mode_to_access(openMode);
// truncating requires write permission
if (error == B_OK && (openMode & O_TRUNC))
accessMode |= ACCESS_W;
// check open mode against permissions // check open mode against permissions
if (error == B_OK) if (error == B_OK)
error = node->CheckPermissions(accessMode); error = node->CheckPermissions(accessMode);
@ -1222,7 +1220,7 @@ ramfs_create_dir(fs_volume* _volume, fs_vnode* _dir, const char *name, int mode)
} }
// check directory write permissions // check directory write permissions
error = dir->CheckPermissions(ACCESS_W); error = dir->CheckPermissions(W_OK);
Node *node = NULL; Node *node = NULL;
if (error == B_OK) { if (error == B_OK) {
// check if entry does already exist // check if entry does already exist
@ -1272,7 +1270,7 @@ ramfs_remove_dir(fs_volume* _volume, fs_vnode* _dir, const char *name)
NodeMTimeUpdater mTimeUpdater(dir); NodeMTimeUpdater mTimeUpdater(dir);
// check directory write permissions // check directory write permissions
status_t error = dir->CheckPermissions(ACCESS_W); status_t error = dir->CheckPermissions(W_OK);
ino_t nodeID = -1; ino_t nodeID = -1;
if (error == B_OK) { if (error == B_OK) {
// check if entry exists // check if entry exists
@ -1434,7 +1432,7 @@ ramfs_open_attr_dir(fs_volume* _volume, fs_vnode* _node, void** _cookie)
status_t error = B_OK; status_t error = B_OK;
// check permissions // check permissions
error = node->CheckPermissions(ACCESS_R); error = node->CheckPermissions(R_OK);
// create iterator // create iterator
AttributeIterator *iterator = NULL; AttributeIterator *iterator = NULL;
if (error == B_OK) { if (error == B_OK) {
@ -1595,8 +1593,6 @@ ramfs_create_attr(fs_volume* _volume, fs_vnode* _node, const char *name,
// creating and truncating require write permission // creating and truncating require write permission
int accessMode = open_mode_to_access(openMode); int accessMode = open_mode_to_access(openMode);
if (!attribute || (openMode & O_TRUNC))
accessMode |= ACCESS_W;
// check required permissions against node permissions // check required permissions against node permissions
status_t error = node->CheckPermissions(accessMode); status_t error = node->CheckPermissions(accessMode);
@ -1666,8 +1662,6 @@ ramfs_open_attr(fs_volume* _volume, fs_vnode* _node, const char *name,
// truncating requires write permission // truncating requires write permission
int accessMode = open_mode_to_access(openMode); int accessMode = open_mode_to_access(openMode);
if (error == B_OK && (openMode & O_TRUNC))
accessMode |= ACCESS_W;
// check open mode against permissions // check open mode against permissions
if (error == B_OK) if (error == B_OK)
@ -1757,7 +1751,7 @@ ramfs_read_attr(fs_volume* _volume, fs_vnode* _node, void* _cookie, off_t pos,
// check permissions // check permissions
int accessMode = open_mode_to_access(cookie->GetOpenMode()); int accessMode = open_mode_to_access(cookie->GetOpenMode());
if (error == B_OK && !(accessMode & ACCESS_R)) if (error == B_OK && !(accessMode & R_OK))
SET_ERROR(error, B_NOT_ALLOWED); SET_ERROR(error, B_NOT_ALLOWED);
// read // read
@ -1801,7 +1795,7 @@ ramfs_write_attr(fs_volume* _volume, fs_vnode* _node, void* _cookie,
// check permissions // check permissions
int accessMode = open_mode_to_access(cookie->GetOpenMode()); int accessMode = open_mode_to_access(cookie->GetOpenMode());
if (error == B_OK && !(accessMode & ACCESS_W)) if (error == B_OK && !(accessMode & W_OK))
SET_ERROR(error, B_NOT_ALLOWED); SET_ERROR(error, B_NOT_ALLOWED);
// write the data // write the data
@ -1840,7 +1834,7 @@ ramfs_read_attr_stat(fs_volume* _volume, fs_vnode* _node, void* _cookie,
// check permissions // check permissions
int accessMode = open_mode_to_access(cookie->GetOpenMode()); int accessMode = open_mode_to_access(cookie->GetOpenMode());
if (error == B_OK && !(accessMode & ACCESS_R)) if (error == B_OK && !(accessMode & R_OK))
SET_ERROR(error, B_NOT_ALLOWED); SET_ERROR(error, B_NOT_ALLOWED);
// read // read
@ -1877,7 +1871,7 @@ ramfs_remove_attr(fs_volume* _volume, fs_vnode* _node, const char *name)
NodeMTimeUpdater mTimeUpdater(node); NodeMTimeUpdater mTimeUpdater(node);
// check permissions // check permissions
error = node->CheckPermissions(ACCESS_W); error = node->CheckPermissions(W_OK);
// find the attribute // find the attribute
Attribute *attribute = NULL; Attribute *attribute = NULL;