Skip to content

Commit d0c3df6

Browse files
Matthew Wilcox (Oracle)aalexandrovich
authored andcommitted
ntfs3: Convert attr_data_write_resident to use a folio
Now that both callers of attr_data_write_resident() have a folio, pass it in and use memcpy_from_folio() to handle all the gnarly highmem multi-page problems. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Signed-off-by: Konstantin Komarov <[email protected]>
1 parent 0c1a156 commit d0c3df6

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

fs/ntfs3/attrib.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ int attr_data_read_resident(struct ntfs_inode *ni, struct folio *folio)
12661266
return 0;
12671267
}
12681268

1269-
int attr_data_write_resident(struct ntfs_inode *ni, struct page *page)
1269+
int attr_data_write_resident(struct ntfs_inode *ni, struct folio *folio)
12701270
{
12711271
u64 vbo;
12721272
struct mft_inode *mi;
@@ -1282,17 +1282,13 @@ int attr_data_write_resident(struct ntfs_inode *ni, struct page *page)
12821282
return E_NTFS_NONRESIDENT;
12831283
}
12841284

1285-
vbo = page->index << PAGE_SHIFT;
1285+
vbo = folio->index << PAGE_SHIFT;
12861286
data_size = le32_to_cpu(attr->res.data_size);
12871287
if (vbo < data_size) {
12881288
char *data = resident_data(attr);
1289-
char *kaddr = kmap_atomic(page);
1290-
u32 use = data_size - vbo;
1289+
size_t len = min(data_size - vbo, folio_size(folio));
12911290

1292-
if (use > PAGE_SIZE)
1293-
use = PAGE_SIZE;
1294-
memcpy(data + vbo, kaddr, use);
1295-
kunmap_atomic(kaddr);
1291+
memcpy_from_folio(data + vbo, folio, 0, len);
12961292
mi->dirty = true;
12971293
}
12981294
ni->i_valid = data_size;

fs/ntfs3/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ static int ntfs_resident_writepage(struct folio *folio,
871871
return -EIO;
872872

873873
ni_lock(ni);
874-
ret = attr_data_write_resident(ni, &folio->page);
874+
ret = attr_data_write_resident(ni, folio);
875875
ni_unlock(ni);
876876

877877
if (ret != E_NTFS_NONRESIDENT)
@@ -959,7 +959,7 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
959959

960960
if (is_resident(ni)) {
961961
ni_lock(ni);
962-
err = attr_data_write_resident(ni, page);
962+
err = attr_data_write_resident(ni, folio);
963963
ni_unlock(ni);
964964
if (!err) {
965965
struct buffer_head *head = folio_buffers(folio);

fs/ntfs3/ntfs_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type,
435435
int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,
436436
CLST *len, bool *new, bool zero);
437437
int attr_data_read_resident(struct ntfs_inode *ni, struct folio *folio);
438-
int attr_data_write_resident(struct ntfs_inode *ni, struct page *page);
438+
int attr_data_write_resident(struct ntfs_inode *ni, struct folio *folio);
439439
int attr_load_runs_vcn(struct ntfs_inode *ni, enum ATTR_TYPE type,
440440
const __le16 *name, u8 name_len, struct runs_tree *run,
441441
CLST vcn);

0 commit comments

Comments
 (0)