diff options
| author | Chao Yu <yuchao0@huawei.com> | 2016-09-20 13:59:07 +0800 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-09-20 09:29:39 -0400 |
| commit | f844cd0d76378fa898890d2448222d407f3f8ecf (patch) | |
| tree | bfee2f2368ee7c198c05c7a06c0fb8e42c5e9fcc | |
| parent | d48f9ce73c997573e1b512893fa6eddf353a6f69 (diff) | |
nfs: cover ->migratepage with CONFIG_MIGRATION
It will be more clean to use CONFIG_MIGRATION to cover nfs' private
.migratepage in nfs_file_aops like we do in other part of nfs
operations.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
| -rw-r--r-- | fs/nfs/file.c | 2 | ||||
| -rw-r--r-- | fs/nfs/internal.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index ca699ddc11c1..580d1c588228 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -543,7 +543,9 @@ const struct address_space_operations nfs_file_aops = { .invalidatepage = nfs_invalidate_page, .releasepage = nfs_release_page, .direct_IO = nfs_direct_IO, +#ifdef CONFIG_MIGRATION .migratepage = nfs_migrate_page, +#endif .launder_page = nfs_launder_page, .is_dirty_writeback = nfs_check_dirty_writeback, .error_remove_page = generic_error_remove_page, diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index fd82bed39ed4..4f0b2db8327f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -535,12 +535,9 @@ void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo) } #endif - #ifdef CONFIG_MIGRATION extern int nfs_migrate_page(struct address_space *, struct page *, struct page *, enum migrate_mode); -#else -#define nfs_migrate_page NULL #endif static inline int |