diff options
author | Jan Kara <jack@suse.cz> | 2017-04-12 06:24:45 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-20 14:09:55 -0400 |
commit | 0db10944a76ba09f37d43b99d0fe085a18307f22 (patch) | |
tree | 0dc08217910a281c96b57f92ef0a18cc2cdd8163 /fs/nfs/client.c | |
parent | a0349ec00f3cb8a9401d065e5db3a5d738e94a89 (diff) |
nfs: Convert to separately allocated bdi
Allocate struct backing_dev_info separately instead of embedding it
inside the superblock. This unifies handling of bdi among users.
CC: Anna Schumaker <anna.schumaker@netapp.com>
CC: linux-nfs@vger.kernel.org
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Acked-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r-- | fs/nfs/client.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 390ada8741bc..04d15a0045e3 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
@@ -761,9 +761,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, | |||
761 | server->rsize = NFS_MAX_FILE_IO_SIZE; | 761 | server->rsize = NFS_MAX_FILE_IO_SIZE; |
762 | server->rpages = (server->rsize + PAGE_SIZE - 1) >> PAGE_SHIFT; | 762 | server->rpages = (server->rsize + PAGE_SIZE - 1) >> PAGE_SHIFT; |
763 | 763 | ||
764 | server->backing_dev_info.name = "nfs"; | ||
765 | server->backing_dev_info.ra_pages = server->rpages * NFS_MAX_READAHEAD; | ||
766 | |||
767 | if (server->wsize > max_rpc_payload) | 764 | if (server->wsize > max_rpc_payload) |
768 | server->wsize = max_rpc_payload; | 765 | server->wsize = max_rpc_payload; |
769 | if (server->wsize > NFS_MAX_FILE_IO_SIZE) | 766 | if (server->wsize > NFS_MAX_FILE_IO_SIZE) |
@@ -917,12 +914,6 @@ struct nfs_server *nfs_alloc_server(void) | |||
917 | return NULL; | 914 | return NULL; |
918 | } | 915 | } |
919 | 916 | ||
920 | if (bdi_init(&server->backing_dev_info)) { | ||
921 | nfs_free_iostats(server->io_stats); | ||
922 | kfree(server); | ||
923 | return NULL; | ||
924 | } | ||
925 | |||
926 | ida_init(&server->openowner_id); | 917 | ida_init(&server->openowner_id); |
927 | ida_init(&server->lockowner_id); | 918 | ida_init(&server->lockowner_id); |
928 | pnfs_init_server(server); | 919 | pnfs_init_server(server); |
@@ -953,7 +944,6 @@ void nfs_free_server(struct nfs_server *server) | |||
953 | ida_destroy(&server->lockowner_id); | 944 | ida_destroy(&server->lockowner_id); |
954 | ida_destroy(&server->openowner_id); | 945 | ida_destroy(&server->openowner_id); |
955 | nfs_free_iostats(server->io_stats); | 946 | nfs_free_iostats(server->io_stats); |
956 | bdi_destroy(&server->backing_dev_info); | ||
957 | kfree(server); | 947 | kfree(server); |
958 | nfs_release_automount_timer(); | 948 | nfs_release_automount_timer(); |
959 | dprintk("<-- nfs_free_server()\n"); | 949 | dprintk("<-- nfs_free_server()\n"); |