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
/
pcache.c
diff --git
a/lunaix-os/kernel/fs/pcache.c
b/lunaix-os/kernel/fs/pcache.c
index 8283fd1f56d899a222ff0d779891ca2b22457361..8f6a710c6ed82000dea0f70d7e4b1158eabe4369 100644
(file)
--- a/
lunaix-os/kernel/fs/pcache.c
+++ b/
lunaix-os/kernel/fs/pcache.c
@@
-140,8
+140,7
@@
pcache_write(struct v_inode* inode, void* data, u32_t len, u32_t fpos)
if (new_page) {
// Filling up the page
if (new_page) {
// Filling up the page
- errno =
- inode->default_fops->read_page(inode, pg->pg, PG_SIZE, pg->fpos);
+ errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos);
if (errno < 0) {
break;
if (errno < 0) {
break;
@@
-178,8
+177,7
@@
pcache_read(struct v_inode* inode, void* data, u32_t len, u32_t fpos)
int new_page = pcache_get_page(pcache, fpos, &pg_off, &pg);
if (new_page) {
// Filling up the page
int new_page = pcache_get_page(pcache, fpos, &pg_off, &pg);
if (new_page) {
// Filling up the page
- errno =
- inode->default_fops->read_page(inode, pg->pg, PG_SIZE, pg->fpos);
+ errno = inode->default_fops->read_page(inode, pg->pg, pg->fpos);
if (errno < 0) {
break;
if (errno < 0) {
break;
@@
-191,7
+189,7
@@
pcache_read(struct v_inode* inode, void* data, u32_t len, u32_t fpos)
pg->len = errno;
} else if (!pg) {
pg->len = errno;
} else if (!pg) {
- errno = inode->default_fops->read
_page
(
+ errno = inode->default_fops->read(
inode, (data + buf_off), len - buf_off, pg->fpos);
buf_off = len;
break;
inode, (data + buf_off), len - buf_off, pg->fpos);
buf_off = len;
break;
@@
-231,8
+229,7
@@
pcache_commit(struct v_inode* inode, struct pcache_pg* page)
return 0;
}
return 0;
}
- int errno =
- inode->default_fops->write_page(inode, page->pg, PG_SIZE, page->fpos);
+ int errno = inode->default_fops->write_page(inode, page->pg, page->fpos);
if (!errno) {
page->flags &= ~PCACHE_DIRTY;
if (!errno) {
page->flags &= ~PCACHE_DIRTY;