diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /fs/nilfs2 | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 922263393c76..57878bd94411 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
| @@ -733,7 +733,8 @@ static int nilfs_setup_super(struct nilfs_sb_info *sbi) | |||
| 733 | cpu_to_le16(le16_to_cpu(sbp[0]->s_state) & ~NILFS_VALID_FS); | 733 | cpu_to_le16(le16_to_cpu(sbp[0]->s_state) & ~NILFS_VALID_FS); |
| 734 | sbp[0]->s_mtime = cpu_to_le64(get_seconds()); | 734 | sbp[0]->s_mtime = cpu_to_le64(get_seconds()); |
| 735 | /* synchronize sbp[1] with sbp[0] */ | 735 | /* synchronize sbp[1] with sbp[0] */ |
| 736 | memcpy(sbp[1], sbp[0], nilfs->ns_sbsize); | 736 | if (sbp[1]) |
| 737 | memcpy(sbp[1], sbp[0], nilfs->ns_sbsize); | ||
| 737 | return nilfs_commit_super(sbi, NILFS_SB_COMMIT_ALL); | 738 | return nilfs_commit_super(sbi, NILFS_SB_COMMIT_ALL); |
| 738 | } | 739 | } |
| 739 | 740 | ||