mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2025-12-23 13:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read supers with bios instead of bl blocks

Browse Source 
Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2016-12-03 18:09:06 -08:00
parent f7f840a342
commit a201cff5ad
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kmod/src/super.c
View File

@@ -32,6 +32,7 @@
#include "item.h"
#include "manifest.h"
#include "seg.h"
#include "bio.h"
#include "scoutfs_trace.h"
static struct kset *scoutfs_kset;
@@ -133,18 +134,24 @@ static int read_supers(struct super_block *sb)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct scoutfs_super_block *super;
struct scoutfs_block *bl = NULL;
struct page *page;
int found = -1;
int ret;
int i;
page = alloc_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
for (i = 0; i < SCOUTFS_SUPER_NR; i++) {
scoutfs_block_put(bl);
bl = scoutfs_block_read(sb, SCOUTFS_SUPER_BLKNO + i);
if (IS_ERR(bl)) {
ret = scoutfs_bio_read(sb, &page, SCOUTFS_SUPER_BLKNO + i, 1);
if (ret) {
scoutfs_warn(sb, "couldn't read super block %u", i);
continue;
}
super = scoutfs_block_data(bl);
super = scoutfs_page_block_address(&page, 0);
if (super->id != cpu_to_le64(SCOUTFS_SUPER_ID)) {
scoutfs_warn(sb, "super block %u has invalid id %llx",
@@ -159,7 +166,7 @@ static int read_supers(struct super_block *sb)
}
}
scoutfs_block_put(bl);
__free_page(page);
if (found < 0) {
scoutfs_err(sb, "unable to read valid super block");