i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added two more convenience VFS calls: vfs_stat_vnode(), and vfs_get_vnode_name().

Browse Source 
Removed *_create() and *_create_entry_ref() syscalls - they are now handled by
*_open() and *_open_entry_ref() calls which get another parameter for the permissions.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11205 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-02-02 06:21:31 +00:00
parent d12de9209a
commit 503950421d
2 changed files with 50 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/elf.c
+2 -2
View File
@@ -1014,7 +1014,7 @@ elf_load_user_image(const char *path, struct team *p, int flags, addr_t *entry)
TRACE(("elf_load: entry path '%s', team %p\n", path, p));
fd = _kern_open(-1, path, 0);
fd = _kern_open(-1, path, O_RDONLY, 0);
if (fd < 0)
return fd;
@@ -1185,7 +1185,7 @@ load_kernel_add_on(const char *path)
TRACE(("elf_load_kspace: entry path '%s'\n", path));
fd = _kern_open(-1, path, 0);
fd = _kern_open(-1, path, O_RDONLY, 0);
if (fd < 0)
return fd;
src/kernel/core/fs/vfs.cpp
+48 -65
View File
@@ -1618,10 +1618,6 @@ get_new_fd(int type, struct fs_mount *mount, struct vnode *vnode,
return B_NO_MORE_FDS;
}
// index directories and queries don't have a vnode but a mount structure attached
if (vnode != NULL)
cache_node_opened(vnode->cache, vnode->device, vnode->id);
return fd;
}
@@ -2102,6 +2098,31 @@ vfs_get_file_map(void *_vnode, off_t offset, size_t size, file_io_vec *vecs, siz
}
status_t
vfs_stat_vnode(void *_vnode, struct stat *stat)
{
struct vnode *vnode = (struct vnode *)_vnode;
status_t status = FS_CALL(vnode, read_stat)(vnode->mount->cookie,
vnode->private_node, stat);
// fill in the st_dev and st_ino fields
if (status == B_OK) {
stat->st_dev = vnode->device;
stat->st_ino = vnode->id;
}
return status;
}
status_t
vfs_get_vnode_name(void *_vnode, char *name, size_t nameSize)
{
return get_vnode_name((struct vnode *)_vnode, NULL, name, nameSize);
}
/** Closes all file descriptors of the specified I/O context that
* don't have the O_CLOEXEC flag set.
*/
@@ -2674,6 +2695,7 @@ file_open_entry_ref(mount_id mountID, vnode_id directoryID, const char *name, in
if (status < B_OK)
put_vnode(vnode);
cache_node_opened(vnode, FDTYPE_FILE, vnode->cache, mountID, directoryID, vnode->id, name);
return status;
}
@@ -2699,6 +2721,7 @@ file_open(int fd, char *path, int openMode, bool kernel)
if (status < B_OK)
put_vnode(vnode);
cache_node_opened(vnode, FDTYPE_FILE, vnode->cache, vnode->device, -1, vnode->id, NULL);
return status;
}
@@ -2710,6 +2733,7 @@ file_close(struct file_descriptor *descriptor)
FUNCTION(("file_close(descriptor = %p)\n", descriptor));
cache_node_closed(vnode, FDTYPE_FILE, vnode->cache, vnode->device, vnode->id);
if (FS_CALL(vnode, close))
return FS_CALL(vnode, close)(vnode->mount->cookie, vnode->private_node, descriptor->cookie);
@@ -2836,8 +2860,6 @@ dir_create(int fd, char *path, int perms, bool kernel)
if (status < 0)
return status;
if (FS_CALL(vnode, create_dir))
status = FS_CALL(vnode, create_dir)(vnode->mount->cookie, vnode->private_node, filename, perms, &newID);
else
@@ -2871,6 +2893,7 @@ dir_open_entry_ref(mount_id mountID, vnode_id parentID, const char *name, bool k
if (status < B_OK)
put_vnode(vnode);
cache_node_opened(vnode, FDTYPE_DIR, vnode->cache, mountID, parentID, vnode->id, name);
return status;
}
@@ -2893,6 +2916,7 @@ dir_open(int fd, char *path, bool kernel)
if (status < B_OK)
put_vnode(vnode);
cache_node_opened(vnode, FDTYPE_DIR, vnode->cache, vnode->device, -1, vnode->id, NULL);
return status;
}
@@ -2904,6 +2928,7 @@ dir_close(struct file_descriptor *descriptor)
FUNCTION(("dir_close(descriptor = %p)\n", descriptor));
cache_node_closed(vnode, FDTYPE_DIR, vnode->cache, vnode->device, vnode->id);
if (FS_CALL(vnode, close_dir))
return FS_CALL(vnode, close_dir)(vnode->mount->cookie, vnode->private_node, descriptor->cookie);
@@ -4670,12 +4695,12 @@ _kern_next_device(int32 *_cookie)
int
_kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int openMode)
_kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int openMode, int perms)
{
char nameCopy[B_FILE_NAME_LENGTH];
strlcpy(nameCopy, name, sizeof(nameCopy));
if (openMode & O_CREAT)
return file_create_entry_ref(device, inode, name, openMode, perms, true);
return file_open_entry_ref(device, inode, nameCopy, openMode, true);
return file_open_entry_ref(device, inode, name, openMode, true);
}
@@ -4695,11 +4720,14 @@ _kern_open_entry_ref(dev_t device, ino_t inode, const char *name, int openMode)
*/
int
_kern_open(int fd, const char *path, int openMode)
_kern_open(int fd, const char *path, int openMode, int perms)
{
char pathBuffer[B_PATH_NAME_LENGTH + 1];
strlcpy(pathBuffer, path, B_PATH_NAME_LENGTH);
if (openMode & O_CREAT)
return file_create(pathBuffer, openMode, perms, true);
return file_open(fd, pathBuffer, openMode, true);
}
@@ -4782,24 +4810,6 @@ _kern_unlock_node(int fd)
}
int
_kern_create_entry_ref(dev_t device, ino_t inode, const char *name,
int openMode, int perms)
{
return file_create_entry_ref(device, inode, name, openMode, perms, true);
}
int
_kern_create(const char *path, int openMode, int perms)
{
char buffer[B_PATH_NAME_LENGTH + 1];
strlcpy(buffer, path, B_PATH_NAME_LENGTH);
return file_create(buffer, openMode, perms, true);
}
status_t
_kern_create_dir_entry_ref(dev_t device, ino_t inode, const char *name, int perms)
{
@@ -5457,7 +5467,8 @@ _user_entry_ref_to_path(dev_t device, ino_t inode, const char *leaf,
int
_user_open_entry_ref(dev_t device, ino_t inode, const char *userName, int openMode)
_user_open_entry_ref(dev_t device, ino_t inode, const char *userName,
int openMode, int perms)
{
char name[B_FILE_NAME_LENGTH];
int status;
@@ -5469,12 +5480,15 @@ _user_open_entry_ref(dev_t device, ino_t inode, const char *userName, int openMo
if (status < B_OK)
return status;
if (openMode & O_CREAT)
return file_create_entry_ref(device, inode, name, openMode, perms, false);
return file_open_entry_ref(device, inode, name, openMode, false);
}
int
_user_open(int fd, const char *userPath, int openMode)
_user_open(int fd, const char *userPath, int openMode, int perms)
{
char path[B_PATH_NAME_LENGTH + 1];
int status;
@@ -5486,6 +5500,9 @@ _user_open(int fd, const char *userPath, int openMode)
if (status < 0)
return status;
if (openMode & O_CREAT)
return file_create(path, openMode, perms, false);
return file_open(fd, path, openMode, false);
}
@@ -5614,40 +5631,6 @@ _user_unlock_node(int fd)
}
int
_user_create_entry_ref(dev_t device, ino_t inode, const char *userName, int openMode, int perms)
{
char name[B_FILE_NAME_LENGTH];
int status;
if (!IS_USER_ADDRESS(userName))
return B_BAD_ADDRESS;
status = user_strlcpy(name, userName, sizeof(name));
if (status < 0)
return status;
return file_create_entry_ref(device, inode, name, openMode, perms, false);
}
int
_user_create(const char *userPath, int openMode, int perms)
{
char path[B_PATH_NAME_LENGTH + 1];
int status;
if (!IS_USER_ADDRESS(userPath))
return B_BAD_ADDRESS;
status = user_strlcpy(path, userPath, B_PATH_NAME_LENGTH);
if (status < 0)
return status;
return file_create(path, openMode, perms, false);
}
status_t
_user_create_dir_entry_ref(dev_t device, ino_t inode, const char *userName, int perms)
{