diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 18:03:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 18:03:36 -0500 |
| commit | 3af03655e885ba7f48ca6318e231a7086a51082e (patch) | |
| tree | 8f7505063593208454184fb5608eadf80f78d122 /fs | |
| parent | 01ed875a12eacd5ece370b20ccf8f51543feb172 (diff) | |
| parent | 0ca7a5b9ac5d301845dd6382ff25a699b6263a81 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix crash after one superblock became unavailable
Diffstat (limited to 'fs')
| -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 0994f6a76c07..58fd707174e1 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
| @@ -704,7 +704,8 @@ skip_mount_setup: | |||
| 704 | sbp[0]->s_state = | 704 | sbp[0]->s_state = |
| 705 | cpu_to_le16(le16_to_cpu(sbp[0]->s_state) & ~NILFS_VALID_FS); | 705 | cpu_to_le16(le16_to_cpu(sbp[0]->s_state) & ~NILFS_VALID_FS); |
| 706 | /* synchronize sbp[1] with sbp[0] */ | 706 | /* synchronize sbp[1] with sbp[0] */ |
| 707 | memcpy(sbp[1], sbp[0], nilfs->ns_sbsize); | 707 | if (sbp[1]) |
| 708 | memcpy(sbp[1], sbp[0], nilfs->ns_sbsize); | ||
| 708 | return nilfs_commit_super(sbi, NILFS_SB_COMMIT_ALL); | 709 | return nilfs_commit_super(sbi, NILFS_SB_COMMIT_ALL); |
| 709 | } | 710 | } |
| 710 | 711 | ||