diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-02-16 14:18:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-02-16 14:18:54 +0100 |
| commit | 5661706efa200252d0e9fea02421b0a5857808c3 (patch) | |
| tree | b6943001feff0af67c206a850be9c536fe3990b4 /fs/f2fs/segment.c | |
| parent | 5791c7699ff1b8be24e1e3b2c08b180598d3ba28 (diff) | |
| parent | 5beb5627a2481aade9aa630b7ebb7f99442321b6 (diff) | |
| download | linux-stable-5661706efa200252d0e9fea02421b0a5857808c3.tar.gz linux-stable-5661706efa200252d0e9fea02421b0a5857808c3.tar.bz2 linux-stable-5661706efa200252d0e9fea02421b0a5857808c3.zip | |
Merge branch 'topic/apple-gmux' into for-next
Pull vga_switcheroo fix for Macs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'fs/f2fs/segment.c')
| -rw-r--r-- | fs/f2fs/segment.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 25ddea478fc1..ae3c4e5474ef 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -663,8 +663,7 @@ init_thread: if (IS_ERR(fcc->f2fs_issue_flush)) { int err = PTR_ERR(fcc->f2fs_issue_flush); - kfree(fcc); - SM_I(sbi)->fcc_info = NULL; + fcc->f2fs_issue_flush = NULL; return err; } @@ -3161,7 +3160,7 @@ static int __get_segment_type_4(struct f2fs_io_info *fio) static int __get_age_segment_type(struct inode *inode, pgoff_t pgofs) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - struct extent_info ei; + struct extent_info ei = {}; if (f2fs_lookup_age_extent_cache(inode, pgofs, &ei)) { if (!ei.age) @@ -5138,11 +5137,9 @@ int f2fs_build_segment_manager(struct f2fs_sb_info *sbi) init_f2fs_rwsem(&sm_info->curseg_lock); - if (!f2fs_readonly(sbi->sb)) { - err = f2fs_create_flush_cmd_control(sbi); - if (err) - return err; - } + err = f2fs_create_flush_cmd_control(sbi); + if (err) + return err; err = create_discard_cmd_control(sbi); if (err) |