Skip to content

Commit 678c190

Browse files
fs/ntfs3: Switch to folio to release resources
As part of the process of switching from page to folio. Signed-off-by: Konstantin Komarov <[email protected]>
1 parent db1d2b4 commit 678c190

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

fs/ntfs3/file.c

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,7 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
989989
u64 frame_vbo;
990990
pgoff_t index;
991991
bool frame_uptodate;
992+
struct folio *folio;
992993

993994
if (frame_size < PAGE_SIZE) {
994995
/*
@@ -1043,8 +1044,9 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
10431044
if (err) {
10441045
for (ip = 0; ip < pages_per_frame; ip++) {
10451046
page = pages[ip];
1046-
unlock_page(page);
1047-
put_page(page);
1047+
folio = page_folio(page);
1048+
folio_unlock(folio);
1049+
folio_put(folio);
10481050
}
10491051
goto out;
10501052
}
@@ -1054,9 +1056,10 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
10541056
off = offset_in_page(valid);
10551057
for (; ip < pages_per_frame; ip++, off = 0) {
10561058
page = pages[ip];
1059+
folio = page_folio(page);
10571060
zero_user_segment(page, off, PAGE_SIZE);
10581061
flush_dcache_page(page);
1059-
SetPageUptodate(page);
1062+
folio_mark_uptodate(folio);
10601063
}
10611064

10621065
ni_lock(ni);
@@ -1065,9 +1068,10 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
10651068

10661069
for (ip = 0; ip < pages_per_frame; ip++) {
10671070
page = pages[ip];
1068-
SetPageUptodate(page);
1069-
unlock_page(page);
1070-
put_page(page);
1071+
folio = page_folio(page);
1072+
folio_mark_uptodate(folio);
1073+
folio_unlock(folio);
1074+
folio_put(folio);
10711075
}
10721076

10731077
if (err)
@@ -1109,8 +1113,9 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
11091113
for (ip = 0; ip < pages_per_frame;
11101114
ip++) {
11111115
page = pages[ip];
1112-
unlock_page(page);
1113-
put_page(page);
1116+
folio = page_folio(page);
1117+
folio_unlock(folio);
1118+
folio_put(folio);
11141119
}
11151120
goto out;
11161121
}
@@ -1151,9 +1156,10 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)
11511156
for (ip = 0; ip < pages_per_frame; ip++) {
11521157
page = pages[ip];
11531158
ClearPageDirty(page);
1154-
SetPageUptodate(page);
1155-
unlock_page(page);
1156-
put_page(page);
1159+
folio = page_folio(page);
1160+
folio_mark_uptodate(folio);
1161+
folio_unlock(folio);
1162+
folio_put(folio);
11571163
}
11581164

11591165
if (err)

0 commit comments

Comments
 (0)