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
feat: support user-spcae pci rescan
[lunaix-os.git]
/
lunaix-os
/
kernel
/
block
/
blkpart_gpt.c
diff --git
a/lunaix-os/kernel/block/blkpart_gpt.c
b/lunaix-os/kernel/block/blkpart_gpt.c
index 0bc977df9ea901f4801ca66cd120a9f6e3665a8a..3eee27727008917155ab72366fa70dd1e1ac2115 100644
(file)
--- a/
lunaix-os/kernel/block/blkpart_gpt.c
+++ b/
lunaix-os/kernel/block/blkpart_gpt.c
@@
-31,7
+31,7
@@
blkpart_parse(struct device* master, struct gpt_header* header)
for (size_t i = 0; i < header->ents_len; i++) {
if (!(i % ENT_PER_BLK)) {
for (size_t i = 0; i < header->ents_len; i++) {
if (!(i % ENT_PER_BLK)) {
- errno = master->read(
+ errno = master->
ops.
read(
master, ents_parial, LBA2OFF(ent_lba++), GPT_BLKSIZE);
if (errno < 0) {
goto done;
master, ents_parial, LBA2OFF(ent_lba++), GPT_BLKSIZE);
if (errno < 0) {
goto done;
@@
-70,7
+70,8
@@
blkpart_probegpt(struct device* master)
int errno;
struct gpt_header* gpt_hdr = (struct gpt_header*)valloc(GPT_BLKSIZE);
int errno;
struct gpt_header* gpt_hdr = (struct gpt_header*)valloc(GPT_BLKSIZE);
- if ((errno = master->read(master, gpt_hdr, LBA2OFF(1), LBA2OFF(1))) < 0) {
+ if ((errno = master->ops.read(master, gpt_hdr, LBA2OFF(1), LBA2OFF(1))) <
+ 0) {
goto done;
}
goto done;
}