diff options
| author | Linus Torvalds <[email protected]> | 2023-05-06 18:25:03 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-05-06 18:25:03 +0000 |
| commit | 706ce3caea1cc1dab8c7fd6e7d1389b46ad1570e (patch) | |
| tree | ba7d065f00d18c0f98c88d5d8aee2120b0020337 /fs/nilfs2/segment.c | |
| parent | nfs: fix mis-merged __filemap_get_folio() error check (diff) | |
| parent | afs: fix the afs_dir_get_folio return value (diff) | |
| download | kernel-706ce3caea1cc1dab8c7fd6e7d1389b46ad1570e.tar.gz kernel-706ce3caea1cc1dab8c7fd6e7d1389b46ad1570e.zip | |
Merge tag 'mm-hotfixes-stable-2023-05-06-10-45' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull hotfixes from Andrew Morton:
"Five hotfixes.
Three are cc:stable, two pertain to merge window changes"
* tag 'mm-hotfixes-stable-2023-05-06-10-45' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
afs: fix the afs_dir_get_folio return value
nilfs2: do not write dirty data after degenerating to read-only
mm: do not reclaim private data from pinned page
nilfs2: fix infinite loop in nilfs_mdt_get_block()
mm/mmap/vma_merge: always check invariants
Diffstat (limited to 'fs/nilfs2/segment.c')
| -rw-r--r-- | fs/nilfs2/segment.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 228659612c0d..ac949fd7603f 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2041,6 +2041,9 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode) struct the_nilfs *nilfs = sci->sc_super->s_fs_info; int err; + if (sb_rdonly(sci->sc_super)) + return -EROFS; + nilfs_sc_cstage_set(sci, NILFS_ST_INIT); sci->sc_cno = nilfs->ns_cno; @@ -2724,7 +2727,7 @@ static void nilfs_segctor_write_out(struct nilfs_sc_info *sci) flush_work(&sci->sc_iput_work); - } while (ret && retrycount-- > 0); + } while (ret && ret != -EROFS && retrycount-- > 0); } /** |