From: Ira Weiny <ira.weiny@xxxxxxxxx> As suggested by Jan Kara, move swap_[de]activate to file_operations to simplify address space operations for coming changes. I'm not sure if this should go through Al Viro or Andrew Morton so I'm sending it to both of you. Sorry if this is a problem. Let me know if there is something else I should do. Ira Weiny (2): fs: Clean up mapping variable fs: Move swap_[de]activate to file_operations fs/btrfs/inode.c | 4 +- fs/f2fs/data.c | 123 -------------------------------------------- fs/f2fs/file.c | 122 +++++++++++++++++++++++++++++++++++++++++++ fs/iomap/swapfile.c | 3 +- fs/nfs/file.c | 4 +- fs/xfs/xfs_aops.c | 13 ----- fs/xfs/xfs_file.c | 12 +++++ include/linux/fs.h | 10 ++-- mm/swapfile.c | 12 ++--- 9 files changed, 149 insertions(+), 154 deletions(-) -- 2.20.1