diff options
| author | Darrick J. Wong <djwong@us.ibm.com> | 2012-04-29 18:29:10 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-04-29 18:29:10 -0400 |
| commit | a9c4731780544d52b243bf46e4dd635c67fa9f84 (patch) | |
| tree | dc735f2f59fa2107e8fed8e3d26f259557e34008 /fs/ext4/ext4_jbd2.c | |
| parent | 0441984a3398970ab4820410b9cf4ff85bf3a6b0 (diff) | |
| download | op-kernel-dev-a9c4731780544d52b243bf46e4dd635c67fa9f84.zip op-kernel-dev-a9c4731780544d52b243bf46e4dd635c67fa9f84.tar.gz | |
ext4: calculate and verify superblock checksum
Calculate and verify the superblock checksum. Since the UUID and
block group number are embedded in each copy of the superblock, we
need only checksum the entire block. Refactor some of the code to
eliminate open-coding of the checksum update call.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4_jbd2.c')
| -rw-r--r-- | fs/ext4/ext4_jbd2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index aca1790..90f7c2e 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -138,16 +138,23 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, } int __ext4_handle_dirty_super(const char *where, unsigned int line, - handle_t *handle, struct super_block *sb) + handle_t *handle, struct super_block *sb, + int now) { struct buffer_head *bh = EXT4_SB(sb)->s_sbh; int err = 0; if (ext4_handle_valid(handle)) { + ext4_superblock_csum_set(sb, + (struct ext4_super_block *)bh->b_data); err = jbd2_journal_dirty_metadata(handle, bh); if (err) ext4_journal_abort_handle(where, line, __func__, bh, handle, err); + } else if (now) { + ext4_superblock_csum_set(sb, + (struct ext4_super_block *)bh->b_data); + mark_buffer_dirty(bh); } else sb->s_dirt = 1; return err; |
