hfsplus: implement check consistency of journal log file
Subsystems (2)
Vyacheslav Dubeyko
maintainerPATCH v3 7/15 hfsplus: implement check consistency of journal log file
From: Vyacheslav Dubeyko <[email protected]>
Subject: [PATCH v3 07/15] hfsplus: implement check consistency of journal log file
This patch implements functionality of checking main HFS+ journal structures (journal info block and journal header) before replaying of journal buffer's transactions.
Signed-off-by Vyacheslav Dubeyko <[email protected]>
CC Al Viro <[email protected]>
CC Christoph Hellwig <[email protected]>
Tested-by Hin-Tak Leung <[email protected]>
--- fs/hfsplus/journal.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+)
fs/hfsplus/journal.c +157 -0
@@ -42,6 +42,10 @@ ((sector_t)(blk) << \ (HFSPLUS_SB(sb)->alloc_blksz_shift - HFSPLUS_SECTOR_SHIFT)) +#define TR_START (jh) \ + (le64_to_cpu(((struct hfsplus_journal_header *)(jh))->start)) +#define LAST_TR_END (jh) \ + (le64_to_cpu(((struct hfsplus_journal_header *)(jh))->end))#define JHDR_SIZE (jh) \ (le32_to_cpu(((struct hfsplus_journal_header *)(jh))->jhdr_size))
@@ -130,6 +134,32 @@ static u32 calc_internal_checksum(u32 seed, unsigned char *ptr, int len)#define HFSPLUS_CALC_CHECKSUM (ptr, len) \ HFSPLUS_CHECKSUM(calc_internal_checksum(0, ptr, len)) +static int hfsplus_replay_journal_header (struct super_block *sb) +{ +struct hfsplus_journal *jnl =HFSPLUS_SB (sb)->jnl; +struct hfsplus_journal_header *jh = jnl->jh; +sector_t jh_blk =JH_BLOCK (sb, jnl); +int err; + +hfs_dbg (JOURNAL ,"replay journal header\n" ); + + jh->start =cpu_to_le64 ((u64 )JHDR_SIZE (jh)); + jh->end =cpu_to_le64 ((u64 )JHDR_SIZE (jh)); + + jh->checksum =0 ; + jh->checksum =HFSPLUS_CALC_CHECKSUM ((unsigned char *)jh,sizeof (*jh)); + + err =hfsplus_submit_bio (sb,BLOCK_TO_SEC (sb, jh_blk), + jnl->jh_buf,NULL ,WRITE_SYNC ,NULL ); +if (err) { +pr_err ("unable to write journal header block %llu\n" , + (unsigned long long )jh_blk); +return err; + } + +return 0 ; +} +/* * hfsplus_create_journal - create journal *
@@ -206,6 +236,125 @@ static int hfsplus_create_journal(struct super_block *sb,return 0 ; } +static inline +bool hfsplus_journal_empty (struct hfsplus_journal_header *jh) +{ +return TR_START (jh) ==LAST_TR_END (jh); +} + +static int hfsplus_replay_journal (struct super_block *sb) +{ +/* TODO: implement */ +return -EINVAL ; +} + +static +int hfsplus_check_journal_info_block (struct hfsplus_journal_info_block *jib) +{ +u32 jib_flags; + + jib_flags =be32_to_cpu (jib->flags); +hfs_dbg (JOURNAL ,"jib->flags: %#x\n" , jib_flags); + +/* Check that journal is on another volume */ +if (jib_flags &HFSPLUS_JOURNAL_ON_OTHER_DEVICE && + !(jib_flags &HFSPLUS_JOURNAL_IN_FS )) { +pr_err ("unable to access the HFS+ journal\n" ); +return -EOPNOTSUPP ; + } + +/* Check that journal is created yet */ +if (jib_flags &HFSPLUS_JOURNAL_NEED_INIT ) { +pr_err ("HFS+ journal is not created\n" ); +return -EIO ; + } + +return 0 ; +} + +static int hfsplus_verify_journal_header (struct hfsplus_journal_header *jh) +{ +__le32 jh_checksum; +__le32 checksum; + +if (jh->magic !=cpu_to_le32 (HFSPLUS_JOURNAL_HEADER_MAGIC ) || + jh->endian !=cpu_to_le32 (HFSPLUS_JOURNAL_HEADER_ENDIAN )) { +pr_err ("invalid journal header\n" ); +return -EIO ; + } + + jh_checksum = jh->checksum; + jh->checksum =0 ; + + checksum =HFSPLUS_CALC_CHECKSUM ((unsigned char *)jh,sizeof (*jh)); + +if (le32_to_cpu (checksum) !=le32_to_cpu (jh_checksum)) { + jh->checksum = jh_checksum; +pr_err ("invalid journal header\n" ); +hfs_dbg (JOURNAL ,"calculated CRC %#x, jh_checksum %#x\n" , + checksum,le32_to_cpu (jh_checksum)); +return -EIO ; + } + + jh->checksum = jh_checksum; + +return 0 ; +} + +/* +* hfsplus_check_journal - check consistency of journal log file. +* +* @sb: superblock +*/ +int hfsplus_check_journal (struct super_block *sb) +{ +struct hfsplus_journal_header *jh; +int err; + +if (!HFSPLUS_SB (sb)->jnl) { +hfs_dbg (JOURNAL ,"HFS+ journal absent" ); +return 0 ; + } + +hfs_dbg (JOURNAL ,"check HFS+ journal\n" ); + + err =hfsplus_check_journal_info_block (HFSPLUS_SB (sb)->jnl->jib); +if (err) +return err; + + jh =HFSPLUS_SB (sb)->jnl->jh; + err =hfsplus_verify_journal_header (jh); +if (err) +return err; + +if (test_and_clear_bit (HFSPLUS_SB_NORECOVERY , &HFSPLUS_SB (sb)->flags)) { +pr_info ("journal replay is skiped, mounting read-only.\n" ); + sb->s_flags |=MS_RDONLY ; +return -EROFS ; + } + +if (hfsplus_journal_empty (jh)) { + err =hfsplus_replay_journal_header (sb); +if (unlikely (err)) { +pr_err ("journal replay failed, please run fsck.hfsplus\n" ); +return err; + } +/* If they're the same, we can mount, it's clean */ +hfs_dbg (JOURNAL ,"journal is empty\n" ); +return 0 ; + }else { +/* Try to replay journal */ + err =hfsplus_replay_journal (sb); +if (unlikely (err)) { +pr_err ("journal replay failed, please run fsck.hfsplus\n" ); +return err; + } +hfs_dbg (JOURNAL ,"journal replay is done\n" ); + } + +return 0 ; +} +/* * hfsplus_init_journal - initialize journal object *
@@ -281,6 +430,13 @@ int hfsplus_init_journal(struct super_block *sb) }if (JIB_FLAGS (jnl) &HFSPLUS_JOURNAL_NEED_INIT ) { +if (test_and_clear_bit (HFSPLUS_SB_NORECOVERY , + &HFSPLUS_SB (sb)->flags)) { + sb->s_flags |=MS_RDONLY ; + err = -EROFS ; + goto finish_journal_init; + } +hfs_dbg (JOURNAL ,"create HFS+ journal\n" ); err =hfsplus_create_journal (sb, jnl);
@@ -308,6 +464,7 @@ int hfsplus_init_journal(struct super_block *sb) } } +finish_journal_init:mutex_init (&jnl->jnl_lock); jnl->sbp = sb;HFSPLUS_SB (sb)->jnl = jnl;
Signature · 1 line
1.7.9.5