github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

f2fs: always unlock the page in f2fs_write_single_data_page

Browse Source 
Consolidate the code to unlock the page in f2fs_write_single_data_page
instead of leaving it to the callers for the AOP_WRITEPAGE_ACTIVATE case.
Replace AOP_WRITEPAGE_ACTIVATE with a positive return of 1 as this case
now doesn't match the historic ->writepage special return code that is
on it's way out now that ->writepage has been removed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Christoph Hellwig 2025-05-08 07:14:30 +02:00 committed by Jaegeuk Kim
parent 402dd9f02c
commit 84c5d16711
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/compress.c
View File

@ -1565,8 +1565,7 @@ static int f2fs_write_raw_pages(struct compress_ctx *cc,
NULL, NULL, wbc, io_type,
compr_blocks, false);
if (ret) {
if (ret == AOP_WRITEPAGE_ACTIVATE) {
folio_unlock(folio);
if (ret == 1) {
ret = 0;
} else if (ret == -EAGAIN) {
ret = 0;

8
fs/f2fs/data.c
View File

@ -2917,9 +2917,9 @@ int f2fs_write_single_data_page(struct folio *folio, int *submitted,
* file_write_and_wait_range() will see EIO error, which is critical
* to return value of fsync() followed by atomic_write failure to user.
*/
if (!err)
return AOP_WRITEPAGE_ACTIVATE;
folio_unlock(folio);
if (!err)
return 1;
return err;
}
@ -3133,8 +3133,6 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
ret = f2fs_write_single_data_page(folio,
&submitted, &bio, &last_block,
wbc, io_type, 0, true);
if (ret == AOP_WRITEPAGE_ACTIVATE)
folio_unlock(folio);
#ifdef CONFIG_F2FS_FS_COMPRESSION
result:
#endif
@ -3146,7 +3144,7 @@ static int f2fs_write_cache_pages(struct address_space *mapping,
* keep nr_to_write, since vfs uses this to
* get # of written pages.
*/
if (ret == AOP_WRITEPAGE_ACTIVATE) {
if (ret == 1) {
ret = 0;
goto next;
} else if (ret == -EAGAIN) {