diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 12:19:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 12:19:23 -0800 |
| commit | 215240462a9672db771bb60adcc1c4fdf40e8ec4 (patch) | |
| tree | 0dddb216e9a4e9af2c7d1e004004f689f013219f /fs/ext4/super.c | |
| parent | Merge tag 'dma-mapping-4.21-1' of git://git.infradead.org/users/hch/dma-mapping (diff) | |
| parent | ext4: fix special inode number checks in __ext4_iget() (diff) | |
| download | linux-dev-215240462a9672db771bb60adcc1c4fdf40e8ec4.tar.xz linux-dev-215240462a9672db771bb60adcc1c4fdf40e8ec4.zip | |
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Ted Ts'o:
"Fix a number of ext4 bugs"
* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix special inode number checks in __ext4_iget()
ext4: track writeback errors using the generic tracking infrastructure
ext4: use ext4_write_inode() when fsyncing w/o a journal
ext4: avoid kernel warning when writing the superblock to a dead device
ext4: fix a potential fiemap/page fault deadlock w/ inline_data
ext4: make sure enough credits are reserved for dioread_nolock writes
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d6c142d73d99..fb12d3c17c1b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4902,7 +4902,7 @@ static int ext4_commit_super(struct super_block *sb, int sync) ext4_superblock_csum_set(sb); if (sync) lock_buffer(sbh); - if (buffer_write_io_error(sbh)) { + if (buffer_write_io_error(sbh) || !buffer_uptodate(sbh)) { /* * Oh, dear. A previous attempt to write the * superblock failed. This could happen because the |