diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 10:06:18 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-03-23 10:06:18 -0500 |
commit | 78264bd9c239237fe356c32d08abf8e52a2d8737 (patch) | |
tree | c06736b2677be53b7ec1aafe4e0ad9f42763e35a | |
parent | 3ccc7384db3d762e834dfdae13c1d6434b2fdeab (diff) |
NTFS: Use buffer_migrate_page() for the ->migratepage function of all ntfs
address space operations.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
-rw-r--r-- | fs/ntfs/ChangeLog | 4 | ||||
-rw-r--r-- | fs/ntfs/aops.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index d35a5c8e3da9..8df10700a930 100644 --- a/fs/ntfs/ChangeLog +++ b/fs/ntfs/ChangeLog | |||
@@ -19,13 +19,15 @@ ToDo/Notes: | |||
19 | - Enable the code for setting the NT4 compatibility flag when we start | 19 | - Enable the code for setting the NT4 compatibility flag when we start |
20 | making NTFS 1.2 specific modifications. | 20 | making NTFS 1.2 specific modifications. |
21 | 21 | ||
22 | 2.1.27 - Various bug fixes. | 22 | 2.1.27 - Various bug fixes and cleanups. |
23 | 23 | ||
24 | - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for | 24 | - Fix two compiler warnings on Alpha. Thanks to Andrew Morton for |
25 | reporting them. | 25 | reporting them. |
26 | - Fix an (innocent) off-by-one error in the runlist code. | 26 | - Fix an (innocent) off-by-one error in the runlist code. |
27 | - Fix a buggette in an "should be impossible" case handling where we | 27 | - Fix a buggette in an "should be impossible" case handling where we |
28 | continued the attribute lookup loop instead of aborting it. | 28 | continued the attribute lookup loop instead of aborting it. |
29 | - Use buffer_migrate_page() for the ->migratepage function of all ntfs | ||
30 | address space operations. | ||
29 | 31 | ||
30 | 2.1.26 - Minor bug fixes and updates. | 32 | 2.1.26 - Minor bug fixes and updates. |
31 | 33 | ||
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index 7e361da770b3..7c7e313620fa 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c | |||
@@ -22,6 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
25 | #include <linux/fs.h> | ||
25 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
26 | #include <linux/pagemap.h> | 27 | #include <linux/pagemap.h> |
27 | #include <linux/swap.h> | 28 | #include <linux/swap.h> |
@@ -1551,6 +1552,9 @@ struct address_space_operations ntfs_aops = { | |||
1551 | #ifdef NTFS_RW | 1552 | #ifdef NTFS_RW |
1552 | .writepage = ntfs_writepage, /* Write dirty page to disk. */ | 1553 | .writepage = ntfs_writepage, /* Write dirty page to disk. */ |
1553 | #endif /* NTFS_RW */ | 1554 | #endif /* NTFS_RW */ |
1555 | .migratepage = buffer_migrate_page, /* Move a page cache page from | ||
1556 | one physical page to an | ||
1557 | other. */ | ||
1554 | }; | 1558 | }; |
1555 | 1559 | ||
1556 | /** | 1560 | /** |
@@ -1567,6 +1571,9 @@ struct address_space_operations ntfs_mst_aops = { | |||
1567 | without touching the buffers | 1571 | without touching the buffers |
1568 | belonging to the page. */ | 1572 | belonging to the page. */ |
1569 | #endif /* NTFS_RW */ | 1573 | #endif /* NTFS_RW */ |
1574 | .migratepage = buffer_migrate_page, /* Move a page cache page from | ||
1575 | one physical page to an | ||
1576 | other. */ | ||
1570 | }; | 1577 | }; |
1571 | 1578 | ||
1572 | #ifdef NTFS_RW | 1579 | #ifdef NTFS_RW |