diff options
| author | Huacai Chen <chenhuacai@loongson.cn> | 2023-08-30 17:35:54 +0800 |
|---|---|---|
| committer | Huacai Chen <chenhuacai@loongson.cn> | 2023-08-30 17:35:54 +0800 |
| commit | 9d1785590bbbb69833eae50c136267fce824515d (patch) | |
| tree | 2a5fe54f675e201bbf52a307f1fd5bda9ccee996 /fs/ext4/inode.c | |
| parent | 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff) | |
| parent | 0d0bd28c500173bfca78aa840f8f36d261ef1765 (diff) | |
| download | linux-9d1785590bbbb69833eae50c136267fce824515d.tar.gz linux-9d1785590bbbb69833eae50c136267fce824515d.tar.bz2 linux-9d1785590bbbb69833eae50c136267fce824515d.zip | |
Merge tag 'md-next-20230814-resend' into loongarch-next
LoongArch architecture changes for 6.5 (raid5/6 optimization) depend on
the md changes to fix build and work, so merge them to create a base.
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 43775a6ca505..6eea0886b885 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -6140,7 +6140,7 @@ retry_alloc: if (err == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) goto retry_alloc; out_ret: - ret = block_page_mkwrite_return(err); + ret = vmf_fs_error(err); out: filemap_invalidate_unlock_shared(mapping); sb_end_pagefault(inode->i_sb); |