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
This commit is contained in:
commit
3af03655e8
|
@ -704,7 +704,8 @@ skip_mount_setup:
|
|||
sbp[0]->s_state =
|
||||
cpu_to_le16(le16_to_cpu(sbp[0]->s_state) & ~NILFS_VALID_FS);
|
||||
/* synchronize sbp[1] with sbp[0] */
|
||||
memcpy(sbp[1], sbp[0], nilfs->ns_sbsize);
|
||||
if (sbp[1])
|
||||
memcpy(sbp[1], sbp[0], nilfs->ns_sbsize);
|
||||
return nilfs_commit_super(sbi, NILFS_SB_COMMIT_ALL);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue