aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-01-14 04:42:36 -0500
committerJens Axboe <axboe@fb.com>2015-01-20 16:03:04 -0500
commitde1414a654e66b81b5348dbc5259ecf2fb61655e (patch)
tree2b3d60d6c0dc87ba33caff3e326d5648831d6176 /fs/nfs
parent26ff13047e3dc6c0230a629867e8dbd4a15a7626 (diff)
fs: export inode_to_bdi and use it in favor of mapping->backing_dev_info
Now that we got rid of the bdi abuse on character devices we can always use sb->s_bdi to get at the backing_dev_info for a file, except for the block device special case. Export inode_to_bdi and replace uses of mapping->backing_dev_info with it to prepare for the removal of mapping->backing_dev_info. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Tejun Heo <tj@kernel.org> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/filelayout/filelayout.c2
-rw-r--r--fs/nfs/write.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 7afb52f6a25a..51aa889611cf 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -1081,7 +1081,7 @@ mds_commit:
1081 spin_unlock(cinfo->lock); 1081 spin_unlock(cinfo->lock);
1082 if (!cinfo->dreq) { 1082 if (!cinfo->dreq) {
1083 inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); 1083 inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
1084 inc_bdi_stat(page_file_mapping(req->wb_page)->backing_dev_info, 1084 inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
1085 BDI_RECLAIMABLE); 1085 BDI_RECLAIMABLE);
1086 __mark_inode_dirty(req->wb_context->dentry->d_inode, 1086 __mark_inode_dirty(req->wb_context->dentry->d_inode,
1087 I_DIRTY_DATASYNC); 1087 I_DIRTY_DATASYNC);
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index af3af685a9e3..298abcc5281b 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -786,7 +786,7 @@ nfs_request_add_commit_list(struct nfs_page *req, struct list_head *dst,
786 spin_unlock(cinfo->lock); 786 spin_unlock(cinfo->lock);
787 if (!cinfo->dreq) { 787 if (!cinfo->dreq) {
788 inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); 788 inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
789 inc_bdi_stat(page_file_mapping(req->wb_page)->backing_dev_info, 789 inc_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
790 BDI_RECLAIMABLE); 790 BDI_RECLAIMABLE);
791 __mark_inode_dirty(req->wb_context->dentry->d_inode, 791 __mark_inode_dirty(req->wb_context->dentry->d_inode,
792 I_DIRTY_DATASYNC); 792 I_DIRTY_DATASYNC);
@@ -853,7 +853,7 @@ static void
853nfs_clear_page_commit(struct page *page) 853nfs_clear_page_commit(struct page *page)
854{ 854{
855 dec_zone_page_state(page, NR_UNSTABLE_NFS); 855 dec_zone_page_state(page, NR_UNSTABLE_NFS);
856 dec_bdi_stat(page_file_mapping(page)->backing_dev_info, BDI_RECLAIMABLE); 856 dec_bdi_stat(inode_to_bdi(page_file_mapping(page)->host), BDI_RECLAIMABLE);
857} 857}
858 858
859/* Called holding inode (/cinfo) lock */ 859/* Called holding inode (/cinfo) lock */
@@ -1564,7 +1564,7 @@ void nfs_retry_commit(struct list_head *page_list,
1564 nfs_mark_request_commit(req, lseg, cinfo); 1564 nfs_mark_request_commit(req, lseg, cinfo);
1565 if (!cinfo->dreq) { 1565 if (!cinfo->dreq) {
1566 dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); 1566 dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
1567 dec_bdi_stat(page_file_mapping(req->wb_page)->backing_dev_info, 1567 dec_bdi_stat(inode_to_bdi(page_file_mapping(req->wb_page)->host),
1568 BDI_RECLAIMABLE); 1568 BDI_RECLAIMABLE);
1569 } 1569 }
1570 nfs_unlock_and_release_request(req); 1570 nfs_unlock_and_release_request(req);