git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: make pci device driver loading passive, pci bus scanner will not load them...
[lunaix-os.git]
/
lunaix-os
/
kernel
/
fs
/
twifs
/
twifs.c
diff --git
a/lunaix-os/kernel/fs/twifs/twifs.c
b/lunaix-os/kernel/fs/twifs/twifs.c
index 704a103f270b750f130430b4035d27960b8ff3d1..9d6d9f7189be246fd0ad1c8cb70b580d2aec671f 100644
(file)
--- a/
lunaix-os/kernel/fs/twifs/twifs.c
+++ b/
lunaix-os/kernel/fs/twifs/twifs.c
@@
-18,6
+18,8
@@
#include <lunaix/mm/valloc.h>
#include <lunaix/spike.h>
#include <lunaix/mm/valloc.h>
#include <lunaix/spike.h>
+#include <sys/mm/mempart.h>
+
static struct twifs_node* fs_root;
static struct cake_pile* twi_pile;
static struct twifs_node* fs_root;
static struct cake_pile* twi_pile;
@@
-87,6
+89,12
@@
__twifs_fwrite(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
return twi_node->ops.write(inode, buffer, len, fpos);
}
return twi_node->ops.write(inode, buffer, len, fpos);
}
+int
+__twifs_fwrite_pg(struct v_inode* inode, void* buffer, size_t fpos)
+{
+ return __twifs_fwrite(inode, buffer, MEM_PAGE, fpos);
+}
+
int
__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
{
int
__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
{
@@
-97,6
+105,12
@@
__twifs_fread(struct v_inode* inode, void* buffer, size_t len, size_t fpos)
return twi_node->ops.read(inode, buffer, len, fpos);
}
return twi_node->ops.read(inode, buffer, len, fpos);
}
+int
+__twifs_fread_pg(struct v_inode* inode, void* buffer, size_t fpos)
+{
+ return __twifs_fread(inode, buffer, MEM_PAGE, fpos);
+}
+
struct twifs_node*
__twifs_get_node(struct twifs_node* parent, struct hstr* name)
{
struct twifs_node*
__twifs_get_node(struct twifs_node* parent, struct hstr* name)
{
@@
-275,9
+289,9
@@
twifs_mapping(struct twifs_node* parent, void* data, const char* fmt, ...)
const struct v_file_ops twifs_file_ops = { .close = default_file_close,
.read = __twifs_fread,
const struct v_file_ops twifs_file_ops = { .close = default_file_close,
.read = __twifs_fread,
- .read_page = __twifs_fread,
+ .read_page = __twifs_fread
_pg
,
.write = __twifs_fwrite,
.write = __twifs_fwrite,
- .write_page = __twifs_fwrite,
+ .write_page = __twifs_fwrite
_pg
,
.readdir = __twifs_iterate_dir };
const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,
.readdir = __twifs_iterate_dir };
const struct v_inode_ops twifs_inode_ops = { .dir_lookup = __twifs_dirlookup,