Commit f844cd0d authored by Chao Yu's avatar Chao Yu Committed by Anna Schumaker
Browse files

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: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent d48f9ce7

fs/nfs/file.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -543,7 +543,9 @@ const struct address_space_operations nfs_file_aops = { 
	.invalidatepage = nfs_invalidate_page,

	.invalidatepage = nfs_invalidate_page,

	.releasepage = nfs_release_page,

	.releasepage = nfs_release_page,

	.direct_IO = nfs_direct_IO,

	.direct_IO = nfs_direct_IO,

#ifdef CONFIG_MIGRATION

	.migratepage = nfs_migrate_page,

	.migratepage = nfs_migrate_page,

#endif

	.launder_page = nfs_launder_page,

	.launder_page = nfs_launder_page,

	.is_dirty_writeback = nfs_check_dirty_writeback,

	.is_dirty_writeback = nfs_check_dirty_writeback,

	.error_remove_page = generic_error_remove_page,

	.error_remove_page = generic_error_remove_page,

fs/nfs/internal.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -535,12 +535,9 @@ void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo) 
}

}

#endif

#endif







#ifdef CONFIG_MIGRATION

#ifdef CONFIG_MIGRATION

extern int nfs_migrate_page(struct address_space *,

extern int nfs_migrate_page(struct address_space *,

		struct page *, struct page *, enum migrate_mode);

		struct page *, struct page *, enum migrate_mode);

#else

#define nfs_migrate_page NULL

#endif

#endif





static inline int

static inline int

CRA Git | Maintained and supported by SUSTech CRA and CCSE